From 05f497787ee87aec018a230bee84616ee721864e Mon Sep 17 00:00:00 2001
From: Imran Remtulla <imranr98@pm.me>
Date: Sun, 10 Sep 2023 22:37:32 -0400
Subject: [PATCH] Build script tweak

---
 build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 0ad2412..76fcdde 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,9 @@
 CURR_DIR="$(pwd)"
 trap "cd "$CURR_DIR"" EXIT
 
-git fetch && git merge origin/main && git push                                               # Typically run after a PR to main, so bring dev up to date
+if [ -z "$1" ]; then
+    git fetch && git merge origin/main && git push # Typically run after a PR to main, so bring dev up to date
+fi
 rm ./build/app/outputs/flutter-apk/* 2>/dev/null                                             # Get rid of older builds if any
 flutter build apk && flutter build apk --split-per-abi                                       # Build (both split and combined APKs)
 for file in ./build/app/outputs/flutter-apk/*.sha1; do gpg --sign --detach-sig "$file"; done # Generate PGP signatures