From 88cbc6bcf709a856d211fd6fda93d3a2429322c5 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 18 Nov 2021 12:06:25 +0100 Subject: [PATCH 1/2] Add project_id to Android sign script --- site/static/scripts/sign-android | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site/static/scripts/sign-android b/site/static/scripts/sign-android index 9c64c02edf..b714beddc7 100755 --- a/site/static/scripts/sign-android +++ b/site/static/scripts/sign-android @@ -153,6 +153,7 @@ if [ "$PACKAGE_ID" != "" ]; then if [ "$GOOGLE_SERVICES_PATH" != "" ]; then echo "Replacing Google Services values" GOOGLE_SERVICES=$(jq . "$GOOGLE_SERVICES_PATH") + PROJECT_ID=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.project_id) PROJECT_NUMBER=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.project_number) FIREBASE_URL=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.firebase_url) FIREBASE_STORAGE_BUCKET=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.storage_bucket) @@ -160,6 +161,7 @@ if [ "$PACKAGE_ID" != "" ]; then FIREBASE_API_KEY=$(echo "$FIREBASE_CLIENT" | jq -r .api_key[].current_key) FIREBASE_SDK_APP_ID=$(echo "$FIREBASE_CLIENT" | jq -r .client_info.mobilesdk_app_id) + xmlstarlet ed -L -u "/resources/string[@name='project_id']" -v "$PROJECT_ID" "$STRINGS_VALUES_PATH" xmlstarlet ed -L -u "/resources/string[@name='firebase_database_url']" -v "$FIREBASE_URL" "$STRINGS_VALUES_PATH" xmlstarlet ed -L -u "/resources/string[@name='gcm_defaultSenderId']" -v "$PROJECT_NUMBER" "$STRINGS_VALUES_PATH" xmlstarlet ed -L -u "/resources/string[@name='google_api_key']" -v "$FIREBASE_API_KEY" "$STRINGS_VALUES_PATH" @@ -178,8 +180,8 @@ if [ "$MATTERMOST_RELEASE_STORE_FILE" != "" ] && [ "$MATTERMOST_RELEASE_KEY_ALIA echo "Signing APK" ALIGNED_APK="$OUTPUT/$APP_NAME-aligned.apk" SIGNED_APK="$OUTPUT/$NEW_FILE.apk" - ZIPALIGN=$(find "$ANDROID" -name zipalign) - APKSIGNER=$(find "$ANDROID" -name apksigner) + ZIPALIGN=$(find "$ANDROID" -name zipalign | tail -1) + APKSIGNER=$(find "$ANDROID" -name apksigner | tail -1) $ZIPALIGN -v -p 4 "$REPACK_APK" "$ALIGNED_APK" $APKSIGNER sign --ks "$MATTERMOST_RELEASE_STORE_FILE" --ks-key-alias "$MATTERMOST_RELEASE_KEY_ALIAS" --ks-pass "pass:$MATTERMOST_RELEASE_PASSWORD" --out "$SIGNED_APK" "$ALIGNED_APK" rm "$ALIGNED_APK" From b53ed52dca27dfd1be6d8d83c9d415e2769e48c7 Mon Sep 17 00:00:00 2001 From: Stu Doherty Date: Wed, 24 Nov 2021 11:18:30 -0500 Subject: [PATCH 2/2] Modified to create FIREBASE_URL --- site/static/scripts/sign-android | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/static/scripts/sign-android b/site/static/scripts/sign-android index b714beddc7..416ebffe4c 100755 --- a/site/static/scripts/sign-android +++ b/site/static/scripts/sign-android @@ -155,7 +155,8 @@ if [ "$PACKAGE_ID" != "" ]; then GOOGLE_SERVICES=$(jq . "$GOOGLE_SERVICES_PATH") PROJECT_ID=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.project_id) PROJECT_NUMBER=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.project_number) - FIREBASE_URL=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.firebase_url) + FIREBASE_URL="https://$PROJECT_ID.firebaseio.com" + echo "Setting FIREBASE_URL to: $FIREBASE_URL" FIREBASE_STORAGE_BUCKET=$(echo "$GOOGLE_SERVICES" | jq -r .project_info.storage_bucket) FIREBASE_CLIENT=$(echo "$GOOGLE_SERVICES" | jq ".client[] | select(. | .client_info.android_client_info.package_name == \"$PACKAGE_ID\")") FIREBASE_API_KEY=$(echo "$FIREBASE_CLIENT" | jq -r .api_key[].current_key)