diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
| commit | 22a47eee84dbaa5c731c000c6013ca558bd15892 (patch) | |
| tree | 8b3128fdb91731d95025b86701431826c441c5ba /indra/newview/installers/darwin | |
| parent | a6b85244a6f943a4598ff9b7b8a3343eb1e0d11e (diff) | |
| parent | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (diff) | |
Merge branch 'release/luau-scripting' into lua-resultset
Diffstat (limited to 'indra/newview/installers/darwin')
| -rwxr-xr-x | indra/newview/installers/darwin/apple-notarize.sh | 4 | ||||
| -rwxr-xr-x | indra/newview/installers/darwin/fix_application_icon_position.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh index d90772ec0e..cc4435e614 100755 --- a/indra/newview/installers/darwin/apple-notarize.sh +++ b/indra/newview/installers/darwin/apple-notarize.sh @@ -17,7 +17,7 @@ if [[ -f "$CONFIG_FILE" ]]; then --asc-provider $ASC_PROVIDER \ --file "$zip_file" 2>&1) echo $res - + requestUUID=$(echo $res | awk '/RequestUUID/ { print $NF; }') if [[ -n $requestUUID ]]; then in_progress=1 @@ -26,7 +26,7 @@ if [[ -f "$CONFIG_FILE" ]]; then res=$(xcrun altool --notarization-info "$requestUUID" \ --username $USERNAME \ --password $PASSWORD 2>&1) - if [[ $res != *"in progress"* ]]; then + if [[ $res != *"in progress"* ]]; then in_progress=0 fi echo "." diff --git a/indra/newview/installers/darwin/fix_application_icon_position.sh b/indra/newview/installers/darwin/fix_application_icon_position.sh index 62abcdd07e..841defe96c 100755 --- a/indra/newview/installers/darwin/fix_application_icon_position.sh +++ b/indra/newview/installers/darwin/fix_application_icon_position.sh @@ -1,5 +1,5 @@ #!/bin/bash -# just run this script each time after you change the installer's name to fix the icon misalignment +# just run this script each time after you change the installer's name to fix the icon misalignment mydir="$(dirname "$0")" # If there's more than one DMG in more than one build directory, pick the most # recent one. |