diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2024-07-18 15:21:37 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2024-07-18 15:21:37 +0200 |
| commit | 2f951df8402c036695ab4e844ac2e0f0df691de6 (patch) | |
| tree | 7dca33d125cf12f4129e5185ecfc4f3cd4b8f608 | |
| parent | 3218b4647118af77b5cd6d142b58bc65436c6159 (diff) | |
| parent | 085cce123c6bdc2842105509dfe42c784ce4b436 (diff) | |
| download | mullvadvpn-2f951df8402c036695ab4e844ac2e0f0df691de6.tar.xz mullvadvpn-2f951df8402c036695ab4e844ac2e0f0df691de6.zip | |
Merge branch 'fix-more-browser-download-bugs'
| -rwxr-xr-x | ci/mullvad-browser/download-mullvad-browser.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/mullvad-browser/download-mullvad-browser.sh b/ci/mullvad-browser/download-mullvad-browser.sh index 6e2fc5ea2b..39ef546071 100755 --- a/ci/mullvad-browser/download-mullvad-browser.sh +++ b/ci/mullvad-browser/download-mullvad-browser.sh @@ -47,6 +47,7 @@ function main() { echo "[#] Verifying $PACKAGE_FILENAME signature" if ! gpg --verify "$PACKAGE_FILENAME".asc; then echo "[!] Failed to verify signature" + rm "$PACKAGE_FILENAME" "$PACKAGE_FILENAME.asc" exit 1 fi rm "$PACKAGE_FILENAME.asc" @@ -65,7 +66,8 @@ function main() { fi echo "[#] $PACKAGE_FILENAME has changed" - ln -f "$PACKAGE_FILENAME" "$WORKDIR/" + cp "$PACKAGE_FILENAME" "$WORKDIR/" + # Leaving a file in `$TMP_DIR` is used as an indicator further down that something changed } if [[ ${1:-} == "-h" ]] || [[ ${1:-} == "--help" ]]; then @@ -109,7 +111,7 @@ for repository in "${REPOSITORIES[@]}"; do inbox_dir="$NOTIFY_DIR/$repository" REPOSITORY_TMP_ARTIFACT_DIR=$(mktemp -qdt mullvad-browser-tmp-XXXXXXX) - cp "$TMP_DIR"/* "$REPOSITORY_TMP_ARTIFACT_DIR" + cp "$WORKDIR"/* "$REPOSITORY_TMP_ARTIFACT_DIR" repository_notify_file="$inbox_dir/browser.src" echo "[#] Notifying $repository_notify_file" |