Changeset 23931 for gs3-extensions/i-jetty/trunk/src/setup.bash

Timestamp:

2011-04-19T00:02:57+12:00 (13 years ago)

Author:

davidb

Message:

Some fine-tuning of scripts, as the result of a fresh pass at setting up Greenstone-3 on an Android device

File:

• gs3-extensions/i-jetty/trunk/src/setup.bash (modified) (3 diffs)

gs3-extensions/i-jetty/trunk/src/setup.bash

@@ -18 +18 @@
 
 if [ "x$GSDL3HOME" = "x" ] ; then
-  echo "Setting GSDL3HOME to '../../web'"
+  echo "  Setting GSDL3HOME to '../../web'"
   export GSDL3HOME=../../web
 else 
@@ -26 +26 @@
 if [ "x$SDCARD_WEBAPPS" = "x" ] ; then
 
+  possible_drives=""
   if [ "x$IJOS" = "xcygwin" ] ; then
 
     possible_drives=`ls -d /cygdrive/*/jetty/webapps 2>/dev/null`
-    num_possible_drives=`echo $possible_drives | wc -l`
+  elif [ "x$IJOS" = "xmingw" ] ; then
+    possible_drives=`ls -d /*/jetty/webapps 2>/dev/null`
+  else
+    # Linux and MacOS
+    possible_drives=`ls -d /mnt/*/jetty/webapps 2>/dev/null`
+  fi
 
-    if [ $num_possible_drives = "0" ] ; then
+  num_possible_drives=`echo $possible_drives | wc -l`
+
+  if [ $num_possible_drives = "0" ] ; then
       echo "    Failed to automatically find and sdcard webapps folders"
       echo "    Explicitly set the environment variable SDCARD_WEBAPPS to control"
       echo "      installation on the Android phone"   
-    else 
-      if [ $num_possible_drives = "1" ] ; then
-        export SDCARD_WEBAPPS=${possible_drives[0]}
-      else
-        echo "    Detected more than one possible sdcard webapps folders:"
-        echo "      $possible_drives"
-        echo "    Explicitly set the environment variable SDCARD_WEBAPPS to control"
-        echo "      which one is used for installation on the Android phone"   
-      fi
-    fi
+  elif [ $num_possible_drives = "1" ] ; then
+      export SDCARD_WEBAPPS=${possible_drives[0]}
+  else
+      echo "    Detected more than one possible sdcard webapps folders:"
+      echo "      $possible_drives"
+      echo "    Explicitly set the environment variable SDCARD_WEBAPPS to control"
+      echo "      which one is used for installation on the Android phone"   
   fi
 fi
@@ -72 +77 @@
 echo "+ Your environment has now been set up with iJetty extension for Greenstone"
 
+echo ""
+echo "If this is the first time you have installed Greenstone on the Android device, "
+echo " run:"
+echo "  ./WEBAPP-ROOT-TO-SDCARD.sh"
+echo ""
+echo "Then:"
+echo ""
+echo "  ./JAVA-TO-DEX.sh"
+echo ""
 
+
+
+