summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-07-07 11:45:49 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-07-07 11:45:49 +0200
commit94f3f030f7f1fee24cadf2afb091d6d43380c308 (patch)
treee23adc345ef1613754e4c972b7e1ce1693ee9ad8 /android
parentda9b70071c8eac573e2ff585589ac4589176c002 (diff)
downloadmullvadvpn-94f3f030f7f1fee24cadf2afb091d6d43380c308.tar.xz
mullvadvpn-94f3f030f7f1fee24cadf2afb091d6d43380c308.zip
Handle untracked changes in prepare script
`git diff` can not diff untracked files, this commit makes use of `git status` to detect changes instead. Since the relays.json is not checked in it would otherwise not correct add the commit for the relays.json.
Diffstat (limited to 'android')
-rwxr-xr-xandroid/scripts/prepare-release.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/scripts/prepare-release.sh b/android/scripts/prepare-release.sh
index 61dea58bff..40650d2345 100755
--- a/android/scripts/prepare-release.sh
+++ b/android/scripts/prepare-release.sh
@@ -45,7 +45,7 @@ cargo run -q -p mullvad-api --bin relay_list > dist-assets/relays/relays.json
if [[ ! -f dist-assets/relays/relays.json ]]; then
echo "Error: Relay list missing."
exit 1
-elif git diff --quiet dist-assets/relays/relays.json; then
+elif test ! -n "$(git status --porcelain | grep dist-assets/relays/)"; then
echo "Relay list unchanged, skipping commit."
else
git add dist-assets/relays/relays.json