r3107 - in jhalfs/branches/experimental: . common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Tue Sep 12 14:31:29 PDT 2006


Author: georgeb
Date: 2006-09-12 15:31:29 -0600 (Tue, 12 Sep 2006)
New Revision: 3107

Modified:
   jhalfs/branches/experimental/common/func_check_version.sh
   jhalfs/branches/experimental/jhalfs
Log:
Remove some dead code

Modified: jhalfs/branches/experimental/common/func_check_version.sh
===================================================================
--- jhalfs/branches/experimental/common/func_check_version.sh	2006-09-12 21:03:40 UTC (rev 3106)
+++ jhalfs/branches/experimental/common/func_check_version.sh	2006-09-12 21:31:29 UTC (rev 3107)
@@ -30,12 +30,6 @@
   # This saves us the save/restore hassle of the system IFS value
   local IFS
 
-#  if  echo $ref_version | grep [[:alpha:]] 2>&1 >/dev/null || 
-#      echo $tst_version | grep [[:alpha:]] 2>&1 >/dev/null ;then
-#    echo "Cannot test for text, 0.0.0a, version types, assuming 'success' " 
-#    return    
-#  fi
-    
   write_error_and_die() {
      echo -e "\n\t\t$TXT version -->${tst_version}<-- is too old.
 		    This script requires ${ref_version} or greater\n"
@@ -43,7 +37,7 @@
   }
 
   echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
-  IFS=".-("   # Split up w.x.y.z as well as w.x.y-rc  (catch release candidates)
+  IFS=".-(p"   # Split up w.x.y.z as well as w.x.y-rc  (catch release candidates)
   set -- $ref_version # set postional parameters to minimum ver values
   ref_major=$1; ref_minor=$2; ref_revision=$3
   #

Modified: jhalfs/branches/experimental/jhalfs
===================================================================
--- jhalfs/branches/experimental/jhalfs	2006-09-12 21:03:40 UTC (rev 3106)
+++ jhalfs/branches/experimental/jhalfs	2006-09-12 21:31:29 UTC (rev 3107)
@@ -253,6 +253,7 @@
 if [ -x $SUDO_LOC ]; then
   sudoVer=`sudo -V | head -n1 | cut -d " " -f3`
   echo "SUDO    ${L_arrow}${BOLD}${sudoVer}${R_arrow}${OFF} ..OK"
+  check_version "1.0.0" "${sudoVer}" "SUDO"
 else
   echo "${nl_}\"${RED}sudo${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
   exit 1




More information about the alfs-log mailing list