Changeset 36483

Timestamp:

2022-08-25T11:26:45+12:00 (20 months ago)

Author:

davidb

Message:

Changed how full dir to script's location is worked out, based on StackOverflow article

Location:

main/trunk/greenstone3/service.d

Files:

• greenstone3-start.sh (modified) (1 diff)
• greenstone3-stop.sh (modified) (1 diff)

main/trunk/greenstone3/service.d/greenstone3-start.sh

@@ -1 +1 @@
 #!/bin/bash
 
-full_progname=`pwd`/${BASH_SOURCE}
-full_parentdir=${full_progname%/*/*}
+# See: https://stackoverflow.com/questions/29832037/how-to-get-script-directory-in-posix-sh/29835459#29835459
 
-cd "$full_parentdir" && . ./gs3-setup.sh && ant start
+full_progdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
+full_parentdir=${full_progdir%/*}
 
+cd "$full_parentdir" && . ./gs3-setup-cli.sh && . ./gs3-setup.sh && ant start
+

main/trunk/greenstone3/service.d/greenstone3-stop.sh

@@ -1 +1 @@
 #!/bin/bash
 
-full_progname=`pwd`/${BASH_SOURCE}
-full_parentdir=${full_progname%/*/*}
+# See: https://stackoverflow.com/questions/29832037/how-to-get-script-directory-in-posix-sh/29835459#29835459
 
-cd "$full_parentdir" && . ./gs3-setup.sh && ant stop
+full_progdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
+full_parentdir=${full_progdir%/*}
+
+cd "$full_parentdir" && . ./gs3-setup-cli.sh && . ./gs3-setup.sh && ant stop