From 183a0acabb4c4f42583cb3ab2f0b0bda336d8802 Mon Sep 17 00:00:00 2001
From: virtus <fevirtus@gmail.com>
Date: Fri, 10 Apr 2026 11:58:35 +0700
Subject: [PATCH] feat: Improve AAB SHA-1 verification by enhancing parsing
 logic and adding error handling

---
 .gitea/workflows/build-aab.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/build-aab.yml b/.gitea/workflows/build-aab.yml
index f70828f..52228ca 100644
--- a/.gitea/workflows/build-aab.yml
+++ b/.gitea/workflows/build-aab.yml
@@ -147,9 +147,14 @@ jobs:
           echo "$CERT_OUTPUT"
 
           if [ -n "${EXPECTED_ANDROID_SHA1}" ]; then
-            AAB_SHA1=$(echo "$CERT_OUTPUT" | sed -n 's/^SHA1: //p' | head -n1)
-            AAB_SHA1_NORMALIZED=$(echo "$AAB_SHA1" | tr -d '[:space:]:-' | tr '[:lower:]' '[:upper:]')
-            EXPECTED_SHA1_NORMALIZED=$(echo "${EXPECTED_ANDROID_SHA1}" | tr -d '[:space:]:-' | tr '[:lower:]' '[:upper:]')
+            AAB_SHA1=$(echo "$CERT_OUTPUT" | awk -F'SHA1:' '/SHA1:/{print $2; exit}')
+            AAB_SHA1_NORMALIZED=$(echo "$AAB_SHA1" | tr -cd '[:xdigit:]' | tr '[:lower:]' '[:upper:]')
+            EXPECTED_SHA1_NORMALIZED=$(echo "${EXPECTED_ANDROID_SHA1}" | tr -cd '[:xdigit:]' | tr '[:lower:]' '[:upper:]')
+
+            if [ -z "$AAB_SHA1_NORMALIZED" ]; then
+              echo "Could not parse SHA-1 from keytool output"
+              exit 1
+            fi
 
             if [ "$AAB_SHA1_NORMALIZED" != "$EXPECTED_SHA1_NORMALIZED" ]; then
               echo "AAB SHA-1 mismatch"