Improved our cd to get the playStore json file from secrets.

.github/workflows/cd.yml

@@ -32,19 +32,21 @@ jobs:
       - name: Install jq
         run: sudo apt-get install -y jq
 
+      - name: Determine playstore.json file
+        run: |
+          non_kiwix_organization_tag="PLAYSTORE_JSON_${TAG}"
+          if [ -n "${{ secrets[non_kiwix_organization_tag] }}" ]; then
+            echo "CUSTOM_PLAYSTORE_JSON=${{ secrets[non_kiwix_tag] }}" >> $GITHUB_ENV
+          else
+            echo "CUSTOM_PLAYSTORE_JSON=${{ secrets.PLAYSTORE_JSON }}" >> $GITHUB_ENV
+
       - name: Preparing signing material
         env:
           keystore: ${{ secrets.keystore }}
-          playstore_json: ${{ secrets.PLAYSTORE_JSON }}
+          playstore_json: ${{ env.CUSTOM_PLAYSTORE_JSON }}
         run: |
           echo "$keystore" | base64 -d > kiwix-android/kiwix-android.keystore
-          non_kiwix_organization_tag='PLAYSTORE_JSON_'${TAG}
-          non_kiwix_playstore_json=${{ secrets[non_kiwix_organization_tag] || '' }}
-          if [ -n "$non_kiwix_playstore_json" ]; then
-            echo "$non_kiwix_playstore_json" > kiwix-android/playstore.json
-          else
-            echo "$playstore_json" > kiwix-android/playstore.json
-          fi
+          echo "$playstore_json" > kiwix-android/playstore.json
 
       - name: Should upload Bundle
         run: |