Changeset 37350

Timestamp:

2023-02-24T13:23:47+13:00 (4 weeks ago)

Author:

davidb

Message:

Changed to work more generic named PREPARE script, as Darwin is the same as Linux in the case

File:

• main/trunk/greenstone3/ext-cli/get-selfcontained-ant.sh (modified) (2 diffs)

main/trunk/greenstone3/ext-cli/get-selfcontained-ant.sh

@@ -50 +50 @@
 echo ""
 if [ ! -d $installed_dir ] ; then
-    echo "Runing the $selfcon_ext/PREPARE-${OS_ALLCAPS}.sh"
+    echo "Runing the $selfcon_ext/PREPARE-UNIX.sh"
 
-    cd $selfcon_ext && ./PREPARE-${OS_ALLCAPS}.sh
+    cd $selfcon_ext && ./PREPARE-UNIX.sh
 
     if [ $? != 0 ] ; then
     echo "Error encountered running: " 1>&2
-    echo "        cd $selfcon_ext && ./PREPARE-${OS_ALLCAPS}.sh" 1>&2
+    echo "        cd $selfcon_ext && ./PREPARE-UNIX.sh" 1>&2
     exit 1
     fi
@@ -62 +62 @@
 else
     echo "Detected directory '$installed_dir'"
-    echo "=> Taken to mean that the $selfcon_ext/PREPARE-${OS_ALLCAPS}.sh command has already been run"    
+    echo "=> Taken to mean that the $selfcon_ext/PREPARE-UNIX.sh command has already been run"    
 fi