X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fdev_macos_install.sh;h=e46f5245a2f8a5d0eb4b926f34a4b2365240eab7;hb=99bfb1a08e5ceb3a3c990bb49dcd7433a0880558;hp=c4cd94ce31041ab95eaf34d3e2cb2df61f740648;hpb=dbfa10a0954d79fe8f0cde05dd23aa86efc3885b;p=jalview.git diff --git a/utils/dev_macos_install.sh b/utils/dev_macos_install.sh index c4cd94c..e46f524 100755 --- a/utils/dev_macos_install.sh +++ b/utils/dev_macos_install.sh @@ -1,15 +1,16 @@ #!/usr/bin/env bash # perform a dev build and install on local macOS machine -INSTALLERVOL="Jalview Installer" -APP=Jalview.app +INSTALLERVOL="Jalview Non-Release Installer" +APP="Jalview Local.app" APPLICATIONS=/Applications CHANNEL=NOCHANNEL -DMG=build/install4j/1.8/Jalview-OFFLINE_macos-app_DEVELOPMENT-j8.dmg +DMG=build/install4j/11/Jalview_Local-TEST-macos-java_11.dmg -if [ $1 != "nogradle" ]; then - gradle installers -Pgetdown_channel_name=NOCHANNEL -Pinstall4jMediaTypes=macosArchive -Pgetdown_local=true -Pdev=true + +if [ x$1 != "xnogradle" ]; then + gradle installers -PCHANNEL=LOCAL -Pinstall4j_media_types=macosArchive else echo "Not running gradle installers" fi @@ -23,13 +24,20 @@ if [ $? = 0 ]; then exit 1 fi echo "Mounting '$DMG' at /Volumes" + N=0 while [ \! -e "/Volumes/$INSTALLERVOL/$APP" ]; do - echo -n "." + if [ $(( N%1000 )) = 0 ]; then + echo -n "." + fi + N=$(( N+1 )) done echo "" fi if [ -e "/Volumes/$INSTALLERVOL/$APP" ]; then + echo "Removing '$APPLICATIONS/$APP'" /bin/rm -r "$APPLICATIONS/$APP" + echo "Syncing '/Volumes/$INSTALLERVOL/$APP' to '$APPLICATIONS/'" rsync -avh "/Volumes/$INSTALLERVOL/$APP" "$APPLICATIONS/" + echo "Unmounting '/Volumes/$INSTALLERVOL'" umount "/Volumes/$INSTALLERVOL" fi