Changeset 37616

Timestamp:

2023-04-06T18:12:33+12:00 (13 months ago)

Author:

anupama

Message:

Getting the mac icon for the gs3-server.app to display requires absolute paths from GSDL3SRCHOME

File:

• main/trunk/greenstone3/gs3-server.sh (modified) (2 diffs)

main/trunk/greenstone3/gs3-server.sh

@@ -105 +105 @@
 PRIORITY_HINT="`pwd`/packages/jre"
 if [ "$GSDLOS" = "darwin" ]; then
+    # On mac, when double clicking the gs3-server.app icon, the current working dir is not $GSDL3SRCHOME
+    if [ ! -d "$PRIORITY_HINT" ]; then
+    PRIORITY_HINT="$GSDL3SRCHOME/packages/jre"
+    fi
     if [ ! -d "$PRIORITY_HINT" ]; then
     PRIORITY_HINT=`/usr/libexec/java_home`
@@ -110 +114 @@
     
     # set the mac icon for when launching this script manually 
-    if [ -f "gs3-server.app/Contents/Resources/AutomatorApplet.icns" ]; then
+    if [ -f "$GSDL3SRCHOME/gs3-server.app/Contents/Resources/AutomatorApplet.icns" ]; then
     opt_properties="$opt_properties -Xdock:icon=gs3-server.app/Contents/Resources/AutomatorApplet.icns"
     fi