Changeset 22995

Timestamp:

2010-09-30T15:26:54+13:00 (14 years ago)

Author:

sjm84

Message:

This extension will now ask for the mysql extension if it is not available when setup.bash is sourced

Location:

gs2-extensions/gsdl-amp/trunk

Files:

• packages/CASCADE-MAKE/MYSQL.sh (deleted)
• packages/mysql-5.1.47.tar.gz (deleted)
• setup.bash (modified) (4 diffs)

gs2-extensions/gsdl-amp/trunk/setup.bash

@@ -1 @@
-
 
 extdesc="the Apache-MySql-Php (AMP) Extension"
 
+full_setup=`pwd`/${BASH_SOURCE}
+fulldir=${full_setup%/*}
+fulldir=${fulldir%/.}
+
+failed="false"
+
+source cascade-make/lib/cascade-lib.bash
 
 if [ "x$GEXTAMP" = "x" ] ; then
-  export GEXTAMP=`pwd`
+  export GEXTAMP=$fulldir
   export GEXTAMP_INSTALLED=$GEXTAMP/$GSDLOS
 
@@ -15 +21 @@
     export LD_LIBRARY_PATH=$GEXTAMP_INSTALLED/lib:$LD_LIBRARY_PATH
   fi
-
 
   export APACHE_HTTPD_HOME="$GEXTAMP_INSTALLED";
@@ -29 +34 @@
   fi
 
+  if [ -e $GEXTAMP/packages/CASCADE-MAKE/MYSQL.sh ] ; then
+    echo "The MySQL extension extension has already been acquired"
+  else
+    echo "Attempting to acquire the MySQL extension ..."
+    if [ -e ../mysql ] ; then
+      cp ../mysql/packages/mysql-*.tar.gz packages/. && cp ../mysql/packages/CASCADE-MAKE/MYSQL.sh packages/CASCADE-MAKE/. 
+      
+      if [ $? != "0" ] ; then
+        echo "FAILED -- There was an error copying the necessary files"
+        failed="true"
+      else
+        echo "SUCCESS!"
+      fi 
+    else 
+      echo "FAILED -- The MySQL extension does not exist, please check it out into the extension directory by typing "
+      echo "svn co http://svn.greenstone.org/gs2-extensions/mysql-src/trunk mysql"
+      failed="true"
+    fi
+  fi
 
   extdir=${GEXTAMP##*/}
@@ -38 +62 @@
   fi
 
-
-  echo "+Your environment is now setup for $extdesc to Greenstone"
+  if [ $failed = "true" ] ; then
+    echo "+Your environment was not successfully setup for $extdesc to Greenstone"    
+    GEXTAMP=
+  else
+    echo "+Your environment is now setup for $extdesc to Greenstone"
+  fi
 else
   echo "+Your environment is already setup for $extdesc to Greenstone"