From 9682dd4cfb4a506f8a2cd0a86b5638d506bce6b2 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Thu, 8 Aug 2019 21:42:58 +0200 Subject: [PATCH] build-package: sha256 + gpg signature for Report --- data/build-package.common | 6 +++--- data/build-package.pkg | 18 +++++++++--------- data/build-package.report | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/data/build-package.common b/data/build-package.common index b036ece..7172558 100644 --- a/data/build-package.common +++ b/data/build-package.common @@ -236,8 +236,8 @@ error () { sum_sign_package () { cd "${CWD}" - cd "$(dirname "${ZIP}")" - sha256sum "$(basename "${ZIP}")" > "${ZIP}.sha256" + cd "$(dirname "${1}")" + sha256sum "$(basename "${1}")" > "${1}.sha256" cd "${CWD}" - gpg --sign --detach-sign "${ZIP}.sha256" + gpg --sign --detach-sign "${1}.sha256" } diff --git a/data/build-package.pkg b/data/build-package.pkg index 78dc8af..3c6c3cb 100644 --- a/data/build-package.pkg +++ b/data/build-package.pkg @@ -8,7 +8,7 @@ create_full_package () { zip_add Full zip_add_setup 1 - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_full () { @@ -24,7 +24,7 @@ create_microg_package() { zip_add microG zip_add_setup 0 - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_microg () { @@ -40,7 +40,7 @@ create_fdroid_package() { zip_add FDroid zip_add_setup 0 - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_fdroid () { @@ -56,7 +56,7 @@ create_bromite_webview_package () { zip_add BromiteWebView zip_add_setup 0 - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_bromite_webview () { @@ -72,7 +72,7 @@ create_osmand_package() { zip_add OsmAnd zip_add_setup 0 - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_osmand () { @@ -87,7 +87,7 @@ create_patcher_package() { zip_add patcher - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_patcher () { @@ -102,7 +102,7 @@ create_setupwizard_package() { zip_add SetupWizard - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_setupwizard () { @@ -117,7 +117,7 @@ create_uninstaller_package() { zip_add uninstaller - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_uninstaller () { @@ -132,7 +132,7 @@ create_systest_package() { zip_add systest - sum_sign_package + sum_sign_package "${ZIP}" } mk_pkg_systest () { diff --git a/data/build-package.report b/data/build-package.report index 601f358..62b225b 100644 --- a/data/build-package.report +++ b/data/build-package.report @@ -32,6 +32,8 @@ create_report_real () { esac done + sum_sign_package "${REPORT_FILE}" + } create_report () {