Update lockfile script

Author: Rawa

android/scripts/update-lockfile.sh

@@ -20,9 +20,11 @@ GRADLE_TASKS=(
 export GRADLE_OPTS
 export GRADLE_USER_HOME
 
+cd ../gradle/
+
 function cleanup {
     echo "Cleaning up temp dirs..."
-    rm -rf -- "$GRADLE_USER_HOME" "$TEMP_GRADLE_PROJECT_CACHE_DIR" ../gradle/verification-metadata.dryrun.xml ../gradle/verification-keyring.dryrun.keys ../gradle/verification-keyring.dryrun.gpg
+    rm -rf -- "$GRADLE_USER_HOME" "$TEMP_GRADLE_PROJECT_CACHE_DIR" verification-keyring.gpg
 }
 
 trap cleanup EXIT
@@ -36,7 +38,7 @@ echo "### Updating checksums ###"
 echo ""
 
 echo "Removing old components..."
-sed -i '/<components>/,/<\/components>/d' ../gradle/verification-metadata.xml
+sed -i '/<components>/,/<\/components>/d' verification-metadata.xml
 echo ""
 
 echo "Generating new components..."
@@ -47,35 +49,27 @@ for GRADLE_TASK in "${GRADLE_TASKS[@]}"; do
     echo ""
 done
 
-echo "### Updating keys ###"
-echo ""
+echo "Moving checksums to the side..."
+mv verification-metadata.xml verification-metadata.checksums.xml
 
-echo "Temporarily enabling key servers..."
-sed -Ei 's,key-servers enabled="[^"]+",key-servers enabled="true",' ../gradle/verification-metadata.xml
 
-echo "Generating new trusted keys..."
-../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys --dry-run
 
-# Move keys from dry run file to existing file.
-# This part is taken from: https://gitlab.com/fdroid/fdroidclient/-/blob/master/gradle/update-verification-metadata.sh
+echo "### Updating keys metadata ###"
+echo ""
 
-# Extract the middle of the new file due to: https://github.com/gradle/gradle/issues/18569
-grep -B 10000 "<trusted-keys>" ../gradle/verification-metadata.dryrun.xml > "$TEMP_GRADLE_PROJECT_CACHE_DIR/new.head"
-grep -A 10000 "</trusted-keys>" ../gradle/verification-metadata.dryrun.xml > "$TEMP_GRADLE_PROJECT_CACHE_DIR/new.tail"
-numTopLines="$(< "$TEMP_GRADLE_PROJECT_CACHE_DIR/new.head" wc -l)"
-numTopLinesPlus1="$((numTopLines + 1))"
-numBottomLines="$(< "$TEMP_GRADLE_PROJECT_CACHE_DIR/new.tail" wc -l)"
-numLines="$(< ../gradle/verification-metadata.dryrun.xml wc -l)"
-numMiddleLines="$((numLines - numTopLines - numBottomLines))"
-# Remove 'version=' due to: https://github.com/gradle/gradle/issues/20192
-< ../gradle/verification-metadata.dryrun.xml tail -n "+$numTopLinesPlus1" | head -n "$numMiddleLines" | sed 's/ version="[^"]*"//' > "$TEMP_GRADLE_PROJECT_CACHE_DIR/new.middle"
+echo "Moving keys to be active metadata file"
+mv verification-metadata.keys.xml verification-metadata.xml
 
-# Extract the top and bottom of the old file
-grep -B 10000 "<trusted-keys>" ../gradle/verification-metadata.xml > "$TEMP_GRADLE_PROJECT_CACHE_DIR/old.head"
-grep -A 10000 "</trusted-keys>" ../gradle/verification-metadata.xml > "$TEMP_GRADLE_PROJECT_CACHE_DIR/old.tail"
 
-# Update verification metadata file
-cat "$TEMP_GRADLE_PROJECT_CACHE_DIR/old.head" "$TEMP_GRADLE_PROJECT_CACHE_DIR/new.middle" "$TEMP_GRADLE_PROJECT_CACHE_DIR/old.tail" > ../gradle/verification-metadata.xml
+echo "Temporarily enabling key servers..."
+sed -Ei 's,key-servers enabled="[^"]+",key-servers enabled="true",' verification-metadata.xml
+
+echo "Removing old components..."
+sed -i '/<components>/,/<\/components>/d' verification-metadata.xml
+echo ""
+
+echo "Generating new trusted keys..."
+../gradlew -q -p .. --project-cache-dir "$TEMP_GRADLE_PROJECT_CACHE_DIR" -M pgp,sha256 "${GRADLE_TASKS[@]}" --export-keys
 
 echo "Sorting keyring and removing duplicates..."
   # Sort and unique the keyring
@@ -86,15 +80,24 @@ echo "Sorting keyring and removing duplicates..."
   # `sort` orders the keys deterministically
   # `uniq` removes identical keys
   # `sed 's/NEWLINE/\n/g'` puts the newlines back
-< ../gradle/verification-keyring.dryrun.keys \
+< verification-keyring.keys \
     sed 's/$/NEWLINE/g' \
     | tr -d '\n' \
     | sed 's/\(-----END PGP PUBLIC KEY BLOCK-----\)/\1\n/g' \
     | grep "END PGP PUBLIC KEY BLOCK" \
     | sort \
     | uniq \
     | sed 's/NEWLINE/\n/g' \
-    > ../gradle/verification-keyring.keys
+    > verification-keyring.new.keys
+
+mv -f verification-keyring.new.keys verification-keyring.keys
 
 echo "Disabling key servers..."
-sed -Ei 's,key-servers enabled="[^"]+",key-servers enabled="false",' ../gradle/verification-metadata.xml
+sed -Ezi 's,key-servers,key-servers enabled="false",' verification-metadata.xml
+
+echo "Moving back keys verification metadata"
+mv verification-metadata.xml verification-metadata.keys.xml
+
+echo ""
+echo "Moving checksums to be active metadata file"
+mv verification-metadata.checksums.xml verification-metadata.xml