Merge branch 'improvement/JAL-1988+JAL-3416_Java8_macOS_APQHandlers_and_FlatLaF_optio...

[jalview.git] / utils / dev_macos_install.sh

diff --git a/utils/dev_macos_install.sh b/utils/dev_macos_install.sh
index 61155c2..e46f524 100755 (executable)
--- a/utils/dev_macos_install.sh
+++ b/utils/dev_macos_install.sh
@@ -1,14 +1,19 @@
 #!/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/11/Jalview-OFFLINE_macos-app_DEVELOPMENT-j11.dmg
+DMG=build/install4j/11/Jalview_Local-TEST-macos-java_11.dmg
 
-gradle installers -Pgetdown_channel_name=NOCHANNEL -Pinstall4jMediaTypes=macosArchive -Pgetdown_local=true
+
+if [ x$1 != "xnogradle" ]; then
+  gradle installers -PCHANNEL=LOCAL -Pinstall4j_media_types=macosArchive
+else
+  echo "Not running gradle installers"
+fi
 
 if [ $? = 0 ]; then
   umount "/Volumes/$INSTALLERVOL"
@@ -19,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