From d95ed0a2c3a2ac8bb385b60dfcf83992c04dc36c Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Fri, 3 Jan 2020 22:17:15 +0100
Subject: [PATCH] [fix] Fix sha256 file format
---
scripts/github.sh | 6 +++---
scripts/release.sh | 12 ++++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/scripts/github.sh b/scripts/github.sh
index 16597945..657eb81a 100755
--- a/scripts/github.sh
+++ b/scripts/github.sh
@@ -117,10 +117,10 @@ case "$1" in
fi
# Send Checksum file
- SHA_BASENAME=${PROJECT_NAME}-v$current.sha
+ SHA_BASENAME=${PROJECT_NAME}-v$current.sha256
SHA_FILE=${PROJECT_DIR}/dist/${SHA_BASENAME}
- echo "${ZIP_SHA256}\n" > ${SHA_FILE}
- echo "${APK_SHA256}\n" >> ${SHA_FILE}
+ echo "${ZIP_SHA256}" > ${SHA_FILE}
+ echo "${APK_SHA256}" >> ${SHA_FILE}
result=$(curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: text/plain' -T "${SHA_FILE}" "${upload_url}?name=${SHA_BASENAME}")
echo "-----------------------------------------"
diff --git a/scripts/release.sh b/scripts/release.sh
index cbc7cab9..355397c2 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -88,15 +88,19 @@ echo "- Building Android artifact..."
echo "----------------------------------"
mkdir -p ${DIST_ANDROID} || exit 1
rm -rf ${DIST_ANDROID}/*.apk || exit 1
+rm -rf ${ANDROID_OUTPUT_APK_RELEASE}/*.apk || exit 1
. scripts/build-android.sh --release
if [[ $? -ne 0 ]]; then
exit 1
fi
APK_RELEASE_FILE="${ANDROID_OUTPUT_APK_RELEASE}/android-release.apk"
-if [[ -f "${APK_RELEASE_FILE}" ]]; then
- mkdir -p ${DIST_ANDROID} || exit 1
- cp ${APK_RELEASE_FILE} ${DIST_ANDROID}/${PROJECT_NAME}-v$2-android.apk || exit 1
-fi;
+if [[ ! -f "${APK_RELEASE_FILE}" ]]; then
+ echo "ERROR: Missing android artifact at ${APK_RELEASE_FILE}"
+ exit 1
+fi
+mkdir -p ${DIST_ANDROID} || exit 1
+cp ${APK_RELEASE_FILE} "${DIST_ANDROID}/${PROJECT_NAME}-v$2-android.apk" || exit 1
+
echo "----------------------------------"
echo "- Building web artifact..."
--
GitLab