r3874 - in jhalfs/branches/new_features: BLFS pkgmngt

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Thu Aug 25 03:04:30 PDT 2016


Author: pierre
Date: Thu Aug 25 03:04:30 2016
New Revision: 3874

Log:
Fix "blfs_root" location in envars.conf, to match initial location
when installing BLFS tools.
Convert package names to lowercase in wrap and pack functions for porg, since
porg does that anyway

Modified:
   jhalfs/branches/new_features/BLFS/envars.conf
   jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg

Modified: jhalfs/branches/new_features/BLFS/envars.conf
==============================================================================
--- jhalfs/branches/new_features/BLFS/envars.conf	Wed Aug 24 08:56:50 2016	(r3873)
+++ jhalfs/branches/new_features/BLFS/envars.conf	Thu Aug 25 03:04:30 2016	(r3874)
@@ -162,4 +162,4 @@
 # where the functions are dfined, and we'll source it just before
 # installing.
 
-export PACK_INSTALL=${HOME}/blfs_root/packInstall.sh # change as needed
+export PACK_INSTALL=/blfs_root/packInstall.sh # change as needed

Modified: jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg
==============================================================================
--- jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg	Wed Aug 24 08:56:50 2016	(r3873)
+++ jhalfs/branches/new_features/pkgmngt/packInstall.sh.porg	Thu Aug 25 03:04:30 2016	(r3874)
@@ -13,6 +13,9 @@
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
            sed 's/^[0-9]\{1\}-//')
+# Porg converts package names to lowercase anyway, so do the conversion
+# ourselves
+PACKAGE=${PACKAGE,,}
 # version is only accessible from PKGDIR name. Since the format of the
 # name is not normalized, several hacks are necessary...
 case $PCKGVRS in
@@ -39,6 +42,9 @@
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
            sed 's/^[0-9]\{1\}-//')
 local PCKGVRS=$(basename $PKGDIR)
+# Porg converts package names to lowercase anyway, so do the conversion
+# ourselves
+PACKAGE=${PACKAGE,,}
 case $PCKGVRS in
   expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;
   vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;


More information about the alfs-log mailing list