[fix] Fix Release scripts

scripts/build-android.sh

@@ -22,9 +22,9 @@ fi
 
 # Run the build
 echo "Cleaning previous android APK files..."
-rm -rf ${ANDROID_OUTPUT_APK_DEBUG}/*.apk
-rm -rf ${ANDROID_OUTPUT_APK_RELEASE}/*.apk
+rm -f ${ANDROID_OUTPUT_APK_DEBUG}/*.apk
+rm -f ${ANDROID_OUTPUT_APK_RELEASE}/*.apk*
 
 echo "Running cordova build android..."
-ionic cordova build android --warning-mode=none --color $*
-#ionic cordova build android --warning-mode=none --color --verbose
+ionic cordova build android --warning-mode=none --color $* -- -- --packageType=apk
+#ionic cordova build android --warning-mode=none --color --verbose -- -- --packageType=apk

scripts/env-global.sh

@@ -25,7 +25,7 @@ NODEJS_VERSION=16
 IONIC_CLI_VERSION=6.20.9
 
 ANDROID_NDK_VERSION=21.0.6113669 # Should be compatible with 'cordova-sqlite-storage' plugin
-ANDROID_SDK_VERSION=32.0.0
+ANDROID_SDK_VERSION=33.0.2
 ANDROID_SDK_CLI_VERSION=8512546 # See https://developer.android.com/studio#command-tools
 ANDROID_SDK_ROOT="${HOME}/Android/Sdk"
 ANDROID_ALTERNATIVE_SDK_ROOT=/usr/lib/android-sdk

scripts/release-android.sh

@@ -20,12 +20,7 @@ APK_SIGNED_FILE=${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-relea
 APK_UNSIGNED_FILE=${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-unsigned.apk
 
 echo "--- Cleaning previous Android APK ..."
-if [[ -f "${APK_SIGNED_FILE}" ]]; then
-  rm -f ${APK_SIGNED_FILE}*
-fi;
-if [[ -f "${APK_UNSIGNED_FILE}" ]]; then
-  rm -f ${APK_UNSIGNED_FILE}
-fi;
+rm -f ${ANDROID_OUTPUT_APK_RELEASE}/*.apk*
 echo "--- Cleaning previous Android APK [OK]"
 echo ""
 

scripts/release-to-github.sh

@@ -157,11 +157,15 @@ fi
 
 # Upload Android APK file
 APK_BASENAME="${PROJECT_NAME}-v${current}-android.apk"
-APK_FILE="${DIST_ANDROID}/${APK_BASENAME}"
+APK_FILE="${ANDROID_OUTPUT_APK_RELEASE}/${ANDROID_OUTPUT_APK_PREFIX}-release-signed.apk"
 if [[ -f "${APK_FILE}" ]]; then
+  # Copy to dist/android
+  mkdir -p ${DIST_ANDROID}
+  cp -f "${APK_FILE}" "${DIST_ANDROID}/${APK_BASENAME}"
+
   result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/vnd.android.package-archive' -T "${APK_FILE}" "${upload_url}?name=${APK_BASENAME}")
   browser_download_url=$(echo "$result" | grep -P "\"browser_download_url\":[ ]?\"[^\"]+" | grep -oP "\"browser_download_url\":[ ]?\"[^\"]+"  | grep -oP "https://[A-Za-z0-9/.-]+")
-  APK_SHA256=$(cd ${DIST_ANDROID} && sha256sum "${APK_BASENAME}")
+  APK_SHA256=$(sha256sum "${APK_FILE}" | sed 's/ /\n/gi' | head -n 1)
   echo " - ${browser_download_url}  | SHA256 Checksum: ${APK_SHA256}"
   echo "${APK_SHA256}  ${APK_BASENAME}" > "${APK_FILE}.sha256"
   result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: text/plain' -T "${APK_FILE}.sha256" "${upload_url}?name=${APK_BASENAME}.sha256")

scripts/release.sh

@@ -148,7 +148,7 @@ echo "----------------------------------"
 echo "- Uploading web extension to Mozilla ..."
 echo "----------------------------------"
 . ${PROJECT_DIR}/scripts/release-sign-extension.sh $1
-# FIXME: always failed: but continue
+# FIXME: always failed, but continue
 #[[ $? -ne 0 ]] && exit 1
 
 echo "----------------------------------"