Changeset 32004 for main/trunk

Timestamp:

2017-09-28T18:35:51+13:00 (7 years ago)

Author:

ak19

Message:

Additional changes to previous commit of makegs2.sh, to allow passing in the optional parameters in any order

File:

• main/trunk/greenstone2/makegs2.sh (modified) (3 diffs)

main/trunk/greenstone2/makegs2.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# run as: ./makegs2.sh
-# or ./makegs2.sh gnome-lib to compile GS2 using gnome-lib 
-# which checks out gnome-lib src from svn if needed and if possible
+# run as: ./makegs2.sh [gnome-lib] [imagemagick]
+# If gnome-lib passed in, will compile GS2 using gnome-lib 
+# which checks out gnome-lib src from svn if possible and if needed (if no ext/gnome-lib-minimal)
+# If you pass in imagemagick, it will grab the appropriate linux/darwin binary, untar
+# this and put its OS subfolder renamed as imagemagick into the bin/os folder.
 
-docheckout=$1
-getimagick=$2
+getgnomelib=
+getimagick=
+
+# https://stackoverflow.com/questions/20449680/unix-boolean-operators-a-o
+if [[ "x$1" == "xgnome-lib" ]]; then 
+    getgnomelib=$1
+elif [[ "x$1" == "ximagemagick" ]]; then 
+    getimagick=$1
+fi
+
+if [[ "x$2" == "xgnome-lib" ]]; then 
+    getgnomelib=$2
+elif [[ "x$2" == "ximagemagick" ]]; then 
+    getimagick=$2
+fi
+
+if [ "x$getgnomelib" != "x" ]; then
+    echo "Will be getting gnomelib"
+fi
+if [ "x$getimagick" != "x" ]; then
+    echo "Will be getting imagemagick"
+fi
+
+if [[ "x$getgnomelib" == "x" && "x$getimagick" == "x" ]]; then
+    echo "No recognised args provided"
+fi
+
 gsdlhome=`pwd`
 echo "**** GSDLHOME: $gsdlhome"
@@ -19 +46 @@
 # Compile by chaining the commands with && so it stops at that stage after an error
 cd $gsdlhome
-if [ "x$docheckout" = "xgnome-lib" ]; then
+if [ "x$getgnomelib" = "xgnome-lib" ]; then
     ./configure --enable-gnome-lib-ext --enable-apache-httpd \
     && make \
@@ -34 +61 @@
     # 5. Message to warn user that the env of this x-term uses gnome-lib 
     # and GUIs may not work from this console
-    if [ "x$docheckout" = "xgnome-lib" ]; then
+    if [ "x$getgnomelib" = "xgnome-lib" ]; then
     echo "*** The environment for this console has been set to compile Greenstone with gnome-lib."
     echo "*** As a result, graphical applications may not work well."