livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-520 Post-merge build fix + error handling improvement

master
Andrey Lihatskiy 2021-05-01 02:05:06 +03:00
parent 789be6b933
commit 02405a74d2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/installers/darwin/apple-notarize.sh
View File

@ -30,12 +30,15 @@ if [ -f "$CONFIG_FILE" ]; then
--username $USERNAME \
--password $PASSWORD
#remove temporary file
rm "$zip_file"
if [["$status" == "success"]]; then
xcrun stapler staple "$app_file"
elif [["$status" == "invalid"]]; then
exit 1
fi
fi
#remove temporary file
rm "$zip_file"
fi
fi

2
indra/newview/viewer_manifest.py
View File

@ -1294,7 +1294,7 @@ class DarwinManifest(ViewerManifest):
libvlc_path = app_in_dmg + "/Contents/Resources/llplugin/media_plugin_libvlc.dylib"
cef_path = app_in_dmg + "/Contents/Resources/llplugin/media_plugin_cef.dylib"
slplugin_path = app_in_dmg + "/Contents/Resources/SLPlugin.app/Contents/MacOS/SLPlugin"
greenlet_path = app_in_dmg + "/Contents/Resources/updater/greenlet.so"
greenlet_path = app_in_dmg + "/Contents/Resources/updater/greenlet/_greenlet.so"
while (not signed) and (sign_attempts > 0):
try:
sign_attempts-=1