diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-12 23:32:18 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-12 23:32:18 +0200 |
| commit | efe9f0e865387f0aacf2d2f1f4a6a7c9aa007690 (patch) | |
| tree | 989a4b9ff2b32311dcb164904d593918fdbd5670 /indra/newview | |
| parent | 38e77cb958cc88dd75e4d06994c0c93953692f83 (diff) | |
| parent | 1ec05e93695a661f6b3b6e374bf60cb991bab954 (diff) | |
Merge branch 'master' into DRTVWR-553-maint-mix-JK
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/installers/darwin/apple-notarize.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 5e3ec53ea6..db0785f273 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.5.2 +6.5.3 diff --git a/indra/newview/installers/darwin/apple-notarize.sh b/indra/newview/installers/darwin/apple-notarize.sh index 466898ecda..e019437924 100755 --- a/indra/newview/installers/darwin/apple-notarize.sh +++ b/indra/newview/installers/darwin/apple-notarize.sh @@ -16,8 +16,9 @@ if [ -f "$CONFIG_FILE" ]; then --password $PASSWORD \ --asc-provider $ASC_PROVIDER \ --file "$zip_file" 2>&1) + echo $res + requestUUID=$(echo $res | awk '/RequestUUID/ { print $NF; }') - echo "Apple Notarization RequestUUID: $requestUUID" if [[ -n $requestUUID ]]; then |