Changeset 30119

Timestamp:

2015-08-22T19:22:41+12:00 (9 years ago)

Author:

ak19

Message:

Mac icons for when launching the startup scripts from the command line. This also ensures the appropriate icon for the second item in the dock panel when launching the .app files.

Location:

main/trunk

Files:

• gli/client-gli.sh (modified) (1 diff)
• gli/gems.sh (modified) (1 diff)
• gli/gli.sh (modified) (1 diff)
• greenstone3/gs3-server.sh (modified) (1 diff)

main/trunk/gli/client-gli.sh

@@ -141 +141 @@
 if [ "$GSDLOS" = "darwin" ]; then
     custom_vm_args="-Xdock:name=$PROGABBR"
+    if [ -f "../client-gli.app/Contents/Resources/AutomatorApplet.icns" ]; then
+    custom_vm_args="$custom_vm_args -Xdock:icon=../client-gli.app/Contents/Resources/AutomatorApplet.icns"
+    fi
 fi
 

main/trunk/gli/gems.sh

@@ -110 +110 @@
 if [ "$GSDLOS" = "darwin" ]; then
     custom_vm_args="-Xdock:name=$PROGABBR"
+    if [ -f "../gems.app/Contents/Resources/AutomatorApplet.icns" ]; then
+    custom_vm_args="$custom_vm_args -Xdock:icon=../gems.app/Contents/Resources/AutomatorApplet.icns"
+    fi
 fi
 

main/trunk/gli/gli.sh

@@ -149 +149 @@
     if [ "$GSDLOS" = "darwin" ]; then
         custom_vm_args="-Xdock:name=$PROGABBR"
+    if [ -f "../gli.app/Contents/Resources/AutomatorApplet.icns" ]; then
+       custom_vm_args="$custom_vm_args -Xdock:icon=../gli.app/Contents/Resources/AutomatorApplet.icns"
+    fi
     fi
     

main/trunk/greenstone3/gs3-server.sh

@@ -104 +104 @@
 # JRE_HOME or JAVA_HOME must be set correctly to run this program
 HINT="`pwd`/packages/jre"
-if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then
-    HINT=`/usr/libexec/java_home`
+if [ "$GSDLOS" = "darwin" ]; then
+    if [ ! -d "$HINT" ]; then
+    HINT=`/usr/libexec/java_home`
+    fi
+    
+    # set the mac icon for when launching this script manually 
+    if [ -f "gs3-server.app/Contents/Resources/AutomatorApplet.icns" ]; then
+    opt_properties="$opt_properties -Xdock:icon=gs3-server.app/Contents/Resources/AutomatorApplet.icns"
+    fi
 fi
+
 javapath=`search4j -p "$HINT" -m $java_min_version -e` 
 if [ "$?" == "0" ]; then