diff --git a/bundle_onelab.sh b/bundle_onelab.sh index 176aba6bcd6d6cddadddc0f23289f0e46cfc2241..363c2c2a7850ca81b6a35fb5b6cec1487afa19b3 100755 --- a/bundle_onelab.sh +++ b/bundle_onelab.sh @@ -189,12 +189,10 @@ if [ $# -lt 1 ] || [ $1 == "macosx" ]; then curl -O https://getdp.info/bin/macOS/getdp-${GETDP}-MacOSXc.tgz ##curl -O https://getdp.info/bin/macOS/getdp-${GETDP}-MacOSXr.tgz curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-MacOSX.zip - curl -O https://gitlab.onelab.info/gmsh/gmsh/-/raw/master/utils/misc/notarize.py mv gmsh-${GMSH}-MacOSX.dmg /tmp mv getdp-${GETDP}-MacOSXc.tgz /tmp ##mv getdp-${GETDP}-MacOSXr.tgz /tmp mv conveks-${CONVEKS}-MacOSX.zip /tmp - mv notarize.py /tmp hdiutil convert /tmp/gmsh-${GMSH}-MacOSX.dmg -format UDTO -o /tmp/gmsh-tmp.cdr hdiutil attach -nobrowse -noverify -noautoopen -mountpoint gmsh_mount /tmp/gmsh-tmp.cdr tar zxvf /tmp/getdp-${GETDP}-MacOSXc.tgz -C /tmp @@ -223,7 +221,8 @@ if [ $# -lt 1 ] || [ $1 == "macosx" ]; then rm -rf /tmp/conveks-* # cannot use zip file: it destroys the signature for onelab.py hdiutil create -srcfolder onelab-MacOSX onelab-MacOSX.dmg - python3 /tmp/notarize.py --package onelab-MacOSX.dmg --username cgeuzaine@ulg.ac.be --primary-bundle-id org.geuz.Gmsh --password "@keychain:Gmsh Notarization" + xcrun notarytool submit onelab-MacOSX.dmg --key /Users/geuzaine/AuthKey_4R6P5NYF3T.p8 --key-id 4R6P5NYF3T --issuer 69a6de7c-0b3a-47e3-e053-5b8c7c11a4d1 --wait + xcrun stapler staple onelab-MacOSX.dmg rm -rf onelab-MacOSX scp onelab-MacOSX.dmg geuzaine@onelab.info:/onelab_files/ fi @@ -235,12 +234,10 @@ if [ $# -lt 1 ] || [ $1 == "macosarm" ]; then curl -O https://getdp.info/bin/macOS/getdp-${GETDP}-MacOSARMc.tgz ##curl -O https://getdp.info/bin/macOS/getdp-${GETDP}-MacOSARMr.tgz curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-MacOSARM.zip - curl -O https://gitlab.onelab.info/gmsh/gmsh/-/raw/master/utils/misc/notarize.py mv gmsh-${GMSH}-MacOSARM.dmg /tmp mv getdp-${GETDP}-MacOSARMc.tgz /tmp ##mv getdp-${GETDP}-MacOSARMr.tgz /tmp mv conveks-${CONVEKS}-MacOSARM.zip /tmp - mv notarize.py /tmp hdiutil convert /tmp/gmsh-${GMSH}-MacOSARM.dmg -format UDTO -o /tmp/gmsh-tmp.cdr hdiutil attach -nobrowse -noverify -noautoopen -mountpoint gmsh_mount /tmp/gmsh-tmp.cdr tar zxvf /tmp/getdp-${GETDP}-MacOSARMc.tgz -C /tmp @@ -269,7 +266,8 @@ if [ $# -lt 1 ] || [ $1 == "macosarm" ]; then rm -rf /tmp/conveks-* # cannot use zip file: it destroys the signature for onelab.py hdiutil create -srcfolder onelab-MacOSARM onelab-MacOSARM.dmg - python3 /tmp/notarize.py --package onelab-MacOSARM.dmg --username cgeuzaine@ulg.ac.be --primary-bundle-id org.geuz.Gmsh --password "@keychain:Gmsh Notarization" + xcrun notarytool submit onelab-MacOSARM.dmg --key /Users/geuzaine/AuthKey_4R6P5NYF3T.p8 --key-id 4R6P5NYF3T --issuer 69a6de7c-0b3a-47e3-e053-5b8c7c11a4d1 --wait + xcrun stapler staple onelab-MacOSARM.dmg rm -rf onelab-MacOSARM scp onelab-MacOSARM.dmg geuzaine@onelab.info:/onelab_files/ fi