r3121 - in jhalfs/branches/experimental: . CLFS CLFS2 HLFS LFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Fri Sep 15 14:19:28 PDT 2006


Author: georgeb
Date: 2006-09-15 15:19:27 -0600 (Fri, 15 Sep 2006)
New Revision: 3121

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/CLFS2/master.sh
   jhalfs/branches/experimental/HLFS/master.sh
   jhalfs/branches/experimental/LFS/master.sh
   jhalfs/branches/experimental/common/func_check_version.sh
   jhalfs/branches/experimental/jhalfs
Log:
Added PATH variable to generated Makefile. /usr/sbin may not be in builders PATH

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-09-15 19:01:44 UTC (rev 3120)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
@@ -1152,6 +1152,8 @@
 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
+export PATH := \${PATH}:/usr/sbin
+
 include makefile-functions
 
 EOF

Modified: jhalfs/branches/experimental/CLFS2/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS2/master.sh	2006-09-15 19:01:44 UTC (rev 3120)
+++ jhalfs/branches/experimental/CLFS2/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
@@ -456,6 +456,8 @@
 PRT_DU     = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
 LUSER_HOME = /home/\$(LUSER)
 
+export PATH := \${PATH}:/usr/sbin
+
 include makefile-functions
 
 EOF

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-09-15 19:01:44 UTC (rev 3120)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
@@ -524,6 +524,8 @@
 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
+export PATH := \${PATH}:/usr/sbin
+
 include makefile-functions
 
 EOF

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-09-15 19:01:44 UTC (rev 3120)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
@@ -405,6 +405,7 @@
 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT) \`\n"
 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
+export PATH := \${PATH}:/usr/sbin
 
 include makefile-functions
 

Modified: jhalfs/branches/experimental/common/func_check_version.sh
===================================================================
--- jhalfs/branches/experimental/common/func_check_version.sh	2006-09-15 19:01:44 UTC (rev 3120)
+++ jhalfs/branches/experimental/common/func_check_version.sh	2006-09-15 21:19:27 UTC (rev 3121)
@@ -36,7 +36,9 @@
      exit 1
   }
 
-  echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
+  echo -ne "${TXT}${dotSTR:${#TXT}}${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
+
+#  echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
   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
@@ -45,13 +47,13 @@
   major=$1; minor=$2; revision=$3
   #
   # Compare against minimum acceptable version..
-  (( major > ref_major )) && echo " ..OK" && return
+  (( major > ref_major )) && echo " ..${GREEN}OK${OFF}" && return
   (( major < ref_major )) && write_error_and_die
     # major=ref_major
   (( minor < ref_minor )) && write_error_and_die
-  (( minor > ref_minor )) && echo " ..OK" && return
+  (( minor > ref_minor )) && echo " ..${GREEN}OK${OFF}" && return
     # minor=ref_minor
-  (( revision >= ref_revision )) && echo " ..OK" && return
+  (( revision >= ref_revision )) && echo " ..${GREEN}OK${OFF}" && return
 
   # oops.. write error msg and die
   write_error_and_die

Modified: jhalfs/branches/experimental/jhalfs
===================================================================
--- jhalfs/branches/experimental/jhalfs	2006-09-15 19:01:44 UTC (rev 3120)
+++ jhalfs/branches/experimental/jhalfs	2006-09-15 21:19:27 UTC (rev 3121)
@@ -257,6 +257,17 @@
   echo "${nl_}\"${RED}sudo${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
   exit 1
 fi
+
+xsltprocVer=`xsltproc -V | head -n1 `
+  libxmlVer=$(echo $xsltprocVer | cut -d " " -f3)
+ libxsltVer=$(echo $xsltprocVer | cut -d " " -f5)
+    tidyVer=`tidy -V | cut -d " " -f9`
+    
+# Version numbers are packed strings not xx.yy.zz format.
+check_version "2.06.20"  "${libxmlVer:0:1}.${libxmlVer:1:2}.${libxmlVer:3:2}"     "LIBXML2"
+check_version "1.01.14"  "${libxsltVer:0:1}.${libxsltVer:1:2}.${libxsltVer:3:2}"  "LIBXSLT"
+check_version "2004"   "${tidyVer}"        "TIDY"
+
 echo "${SD_BORDER}${nl_}"
 
 validate_config




More information about the alfs-log mailing list