diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-07-05 11:03:05 -0500 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-07-05 16:12:52 +0000 |
| commit | b28ae2dc74dd2fee6a66880636bfca53f1083791 (patch) | |
| tree | acb5609f9185002848deade51898bd8ae94255c1 /packaging | |
| parent | aa55c55fbc0e1f95cd9202f5926472631f432807 (diff) | |
macOS: Fix our token wait. Again.
altool isn't guaranteed to clean up after itself, e.g. if an earthquake
takes down the Developer ID Notary Service (thanks to Jim Young for
tracking this down). Instead of checking for the existence of tokens,
check their existence and age.
Change-Id: Iac216d524a4894115ecf33589af1bbdebcc9cbab
Reviewed-on: https://code.wireshark.org/review/33856
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/notarize-dmg.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/macosx/notarize-dmg.sh b/packaging/macosx/notarize-dmg.sh index 6a66b893c3..0c9b2074d4 100755 --- a/packaging/macosx/notarize-dmg.sh +++ b/packaging/macosx/notarize-dmg.sh @@ -54,7 +54,7 @@ fi max_upload_wait=$(( 5 * 60)) start=$SECONDS -while ls "$HOME"/Library/Caches/com.apple.amp.itmstransporter/UploadTokens/*.token > /dev/null 2>&1 ; do +while test -n "$( find "$HOME"/Library/Caches/com.apple.amp.itmstransporter/UploadTokens -iname "*.token" -mtime -4h )" ; do echo -e "Another upload in progress. Waiting 5s\xe2\x80\xa6" sleep 5 elapsed=$(( SECONDS - start )) |