zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix "blfs_root" location in envars.conf, to match initial location

Browse source 
when installing BLFS tools.
Convert package names to lowercase in wrap and pack functions for porg, since
porg does that anyway
This commit is contained in:
Pierre Labastie 2016-08-25 10:04:30 +00:00
parent 316db22956
commit 7bbcce3ce7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/envars.conf
View file

@ -162,4 +162,4 @@ if [ -r /etc/profile ]; then source /etc/profile; fi
# where the functions are dfined, and we'll source it just before # where the functions are dfined, and we'll source it just before
# installing. # installing.
export PACK_INSTALL=${HOME}/blfs_root/packInstall.sh # change as needed export PACK_INSTALL=/blfs_root/packInstall.sh # change as needed

6
pkgmngt/packInstall.sh.porg
View file

@ -13,6 +13,9 @@ local PCKGVRS=$(basename $PKGDIR)
local TGTPKG=$(basename $PKG_DEST) local TGTPKG=$(basename $PKG_DEST)
local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' | local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
sed 's/^[0-9]\{1\}-//') 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 # version is only accessible from PKGDIR name. Since the format of the
# name is not normalized, several hacks are necessary... # name is not normalized, several hacks are necessary...
case $PCKGVRS in case $PCKGVRS in
@ -39,6 +42,9 @@ local TGTPKG=$(basename $PKG_DEST)
local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' | local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
sed 's/^[0-9]\{1\}-//') sed 's/^[0-9]\{1\}-//')
local PCKGVRS=$(basename $PKGDIR) local PCKGVRS=$(basename $PKGDIR)
# Porg converts package names to lowercase anyway, so do the conversion
# ourselves
PACKAGE=${PACKAGE,,}
case $PCKGVRS in case $PCKGVRS in
expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;; 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/') ;; vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;