Changeset 23095

Timestamp:

2010-10-12T10:04:01+13:00 (14 years ago)

Author:

sjm84

Message:

Fixed installclean, makedist and the exthome variable not being set correctly

File:

• other-projects/cascade-make/trunk/lib/cascade-lib.bash (modified) (4 diffs)

other-projects/cascade-make/trunk/lib/cascade-lib.bash

@@ -5 +5 @@
     ext=$1 ; shift
     reldir=$1 ; shift
+
     eval exthome=`echo \\$$ext`
     if test -z "$exthome" ; then
-      echo "Environment variable $1 for Greenstone extension not set"
+      echo "Environment variable $ext for Greenstone extension not set"
       echo "Sourcing $reldir/setup.bash"
       source $reldir/setup.bash
+
+      eval exthome=`echo \\$$ext`
     fi
   fi
@@ -90 +93 @@
 toplevel_make_dist()
 {
-  local currentdir=$1
-
-  local dirname=`basename $currentdir` 
+  local dirname=`basename $exthome` 
 
   local checklist="setup.bash setup.bat perllib $GSDLOS lib"   
@@ -109 +110 @@
 
   popd
-}
-
-opt_make_dist()
-{
-  local type=$1
-
-  if [ $type = "1" ] ; then
-
-    if [ -f MAKE-DIST.sh ] ; then
-      ./MAKE-DIST.sh
-    else
-      toplevel_make_dist `pwd`
-    fi
-  fi
 }
 
@@ -203 +190 @@
 run_installclean()
 {
-  local fulldir="`pwd`/$GSDLOS"
+  local fulldir="$exthome/$GSDLOS"
+  echo ""
   read -p "Delete $fulldir [y/n]?" ans
   if [ $ans = "y" ] ; then