From 07372e3ed184ab4bca5fdae469409410faec6d2c Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 25 Mar 2021 20:22:31 +0100
Subject: fix prepareForDistribution script after update gradle plugin

---
 scripts/prepareForDistribution.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'scripts')

diff --git a/scripts/prepareForDistribution.sh b/scripts/prepareForDistribution.sh
index 9c198689..e6c3ef79 100755
--- a/scripts/prepareForDistribution.sh
+++ b/scripts/prepareForDistribution.sh
@@ -43,16 +43,16 @@ function sign {
     fi
 
     FINAL_APK="${FILE_DIR}/${FILE_NAME}"
-    ALIGNED_UNSIGNED_APK="${FILE_DIR}/aligned-${FILE_NAME}"
-    ALIGNED_SIGNED_APK="${FILE_DIR}/aligned-signed-${FILE_NAME}"
-
-    echo -e "${GREEN} -> zip align ${ALIGNED_UNSIGNED_APK}${NC}"
-    ${ANDROID_BUILD_TOOLS}/zipalign -v -p 4 "${FINAL_APK}" ${ALIGNED_UNSIGNED_APK} > /dev/null && echo "zip alignment successful" || quit
-    echo -e "${GREEN} -> apksign ${ALIGNED_UNSIGNED_APK}${NC}"
-    ${ANDROID_BUILD_TOOLS}/apksigner sign --ks "${KEY_STORE_STRING}" --out ${ALIGNED_SIGNED_APK} ${ALIGNED_UNSIGNED_APK} || quit
-    rm ${ALIGNED_UNSIGNED_APK}
+  #  ALIGNED_UNSIGNED_APK="${FILE_DIR}/aligned-${FILE_NAME}"
+  #  ALIGNED_SIGNED_APK="${FILE_DIR}/aligned-signed-${FILE_NAME}"
+
+    #echo -e "${GREEN} -> zip align ${ALIGNED_UNSIGNED_APK}${NC}"
+    #${ANDROID_BUILD_TOOLS}/zipalign -v -p 4 "${FINAL_APK}" ${ALIGNED_UNSIGNED_APK} > /dev/null && echo "zip alignment successful" || quit
+    echo -e "${GREEN} -> apksign ${FINAL_APK}${NC}"
+    ${ANDROID_BUILD_TOOLS}/apksigner sign --ks "${KEY_STORE_STRING}" --out ${FINAL_APK} ${FINAL_APK} || quit
+    #rm ${ALIGNED_UNSIGNED_APK}
     
-    FINGERPRINT=$(unzip -p ${ALIGNED_SIGNED_APK} META-INF/*.RSA | keytool -printcert | grep "SHA256" | tr -d '[:space:]') || quit
+    FINGERPRINT=$(unzip -p ${FINAL_APK} META-INF/*.RSA | keytool -printcert | grep "SHA256" | tr -d '[:space:]') || quit
     
     if [[ ${FINGERPRINT} == ${EXPECTED_FINGERPRINT} ]] 
     then
@@ -62,8 +62,8 @@ function sign {
         quit
     fi
 
-    echo -e "${GREEN} -> rename aligned signed apk to ${FINAL_APK}${NC}"
-    cp ${ALIGNED_SIGNED_APK} ${FINAL_APK} || quit
+   # echo -e "${GREEN} -> rename aligned signed apk to ${FINAL_APK}${NC}"
+   # cp ${ALIGNED_SIGNED_APK} ${FINAL_APK} || quit
     cleanUp
     
     #---- GPG SIGNING ----
-- 
cgit v1.2.3