Changeset 23590 for main/trunk/gli/client-gli.sh

Timestamp:

2011-01-14T18:47:45+13:00 (13 years ago)

Author:

ak19

Message:

Changed the script files that launch GS applications to contain an extra Java VM argument called Xdock:name for Darwin (MacOS) machines that will set the program abbreviation as the visible name of the top Mac menubar when the application is running in the Dock menu at the bottom.

File:

• main/trunk/gli/client-gli.sh (modified) (3 diffs)

main/trunk/gli/client-gli.sh

@@ -16 +16 @@
     PROGFULLNAME=$PROGNAME
 fi
+export PROGNAME
+export PROGFULLNAME
 
 if [ "x$PROGABBR" = "x" ] ; then
-    PROGABBR="GLI"
+    PROGABBR="Client-GLI"
 fi
+export PROGABBR
 
 if [ "x$PROGNAME_EN" = "x" ] ; then
-    PROGNAME_EN="Greenstone Librarian Interface"
+    PROGNAME_EN="Greenstone Librarian Interface - Remote Client"
 fi
+export PROGNAME_EN
 
 # we're running GLI (or FLI) in client mode
@@ -132 +136 @@
 # -Xloggc:<file>   Write garbage collection log
 
+# -Xdock:name      To set the name of the app in the MacOS Dock bar
+# -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)    
+custom_vm_args=""
+if [ "$GSDLOS" = "darwin" ]; then
+    custom_vm_args="-Xdock:name=$PROGABBR"
+fi
+
 # GS2 only requires -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar. GS3 requires more but it doesn't conflict with GS2:
 if [ "$local_gs" = "false" ]; then
     echo "Since there's no GSDLHOME, client-GLI's download panel will be deactivated."
     echo
-    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone $*
+    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar $custom_vm_args org.greenstone.gatherer.GathererProg -use_remote_greenstone $*
 else
     gsdlos=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -146 +157 @@
     echo "Downloading is enabled."
     echo
-    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "$GSDLHOME" -gsdlos $gsdlos $*
+    $javapath -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/commons-codec-1.3.jar:lib/commons-httpclient-3.1-rc1.jar:lib/commons-logging-1.1.jar $custom_vm_args org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "$GSDLHOME" -gsdlos $gsdlos $*
 fi