Changeset 37672 for main

Timestamp:

2023-04-17T20:35:59+12:00 (12 months ago)

Author:

anupama

Message:

Making mac DMG's MacOS/greenstone script do what the linux wrapper.cpp script does in terms of handling command-line flags minus h/help or minus-minus help to display usage, minus extract and minux textonly, not just the default behaviour of trying to launch the graphical version of the Mac installer.

File:

• main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone (modified) (3 diffs)

main/trunk/release-kits/shared/mac/Wrapper.app/Contents/MacOS/greenstone

@@ -4 +4 @@
 cd "$BINDIR/.."
 BASEDIR="`pwd`"
+
+displayUsage() {
+    echo "Usage: $0 [OPTIONS]"
+    echo "OPTIONS: "
+    echo " -h, -help   Display this usage message"
+    echo " -textonly   Do a non-graphical command line installation"
+    echo " -extract    Extract the jar file, this can then be run manually (such as with custom Java options as arguments to the installer jar file)."
+}
+
+# install_mode can be:
+# Default behaviour (graphical installer, forced to textonly mode in non-graphical environment
+# manual setting to Textonly mode
+# Extract mode to extract jar file
+install_mode="default"
+
+
+if [ "x$1" != "x" ]; then
+    if [ "$1" == "-h" ] || [ "$1" == "-help" ] || [ "$1" == "--help" ] ; then
+    displayUsage
+    exit 0
+    elif [ "$1" == "-textonly" ] || [ "$1" == "-text" ] || [ "$1" == "text" ] ; then
+    install_mode="textonly"
+    elif [ "$1" == "-extract" ] || [ "$1" == "--extract" ] || [ "$1" == "-x" ] ; then
+    install_mode="extract"
+    else
+    displayUsage
+    exit 0
+    fi
+fi
+
 
 # Debugging with a msg box. Need double quotes around msg for $var expansion
@@ -26 +56 @@
         export JRE_HOME=/tmp/jre
         export PATH=$JRE_HOME/bin:$PATH
-        tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar && "/tmp/jre/bin/java" -jar -Xdock:icon="$BASEDIR/Resources/icon.icns" "$gs_installer"
+        #tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar && "/tmp/jre/bin/java" -jar -Xdock:icon="$BASEDIR/Resources/icon.icns" "$gs_installer"
 
+    tar -xvf /tmp/jre.tar -C /tmp && rm /tmp/jre.tar
+
+    if [ "$install_mode" = "extract" ] ; then
+        # no need to extract: installer jar file already available in mac app
+        echo ""
+        echo "(Extracting jar file on mac is superfluous: the jar file is already ready for use at $gs_installer)"
+        echo "You can now run '/tmp/jre/bin/java -jar \"$BASEDIR/Resources/Java/$gs_installer\" text'"
+        echo "  to run the installer from the command line."
+        echo "Once you're finished with the installer, you can run \"rm -rf /tmp/jre\" to get rid of the temporary Java Runtime."
+        echo "Note: if the installer fails to run due to insufficient memory, try preceding the -jar with -Xmx300M in the above command."
+        echo ""
+    elif [ "$install_mode" = "textonly" ] ; then
+        "/tmp/jre/bin/java" -Xmx300M -jar "$gs_installer" "text"
+    else # "$install_mode" = "default", run the usual graphical GS3 mac installer
+        # which already falls back to textonly mode if no graphical environment available
+        "/tmp/jre/bin/java" -jar -Xdock:icon="$BASEDIR/Resources/icon.icns" "$gs_installer"
+    fi
+    
         # if after running the installer, the user cancelled installation, then the jre would still be in tmp, remove it to
-        if [[ -e "/tmp/jre" ]]; then
-           rm -rf /tmp/jre
-        fi
-
+    if [ "$install_mode" != "extract" ] ; then
+            if [[ -e "/tmp/jre" ]]; then
+        rm -rf /tmp/jre
+            fi
+    fi
      else
        # Issues extracting the jre.tar into /tmp (maybe we couldn't even copy it there) - display error message
@@ -41 +90 @@
 else
     # try using a system java to run the installer, as there is no bundled jre_bin for 32 bit Mac OS since these already came with java installed
-  
+  " -h, -help   Display this usage message"
+
     # get the GS jar installer's name and run it with a dock icon (http://stackoverflow.com/questions/6006173/how-do-you-change-the-dock-icon-of-a-java-program)
     cd "$BASEDIR/Resources/Java/"