Author: pierre
Date: Sun Jul 5 22:44:22 2020
New Revision: 4186
Log:
Allow scriptlet numbering to be on 4 digits in packInstall.sh*
Modified:
jhalfs/trunk/pkgmngt/packInstall.sh.dpkg
jhalfs/trunk/pkgmngt/packInstall.sh.porg
jhalfs/trunk/pkgmngt/packInstall.sh.template
Modified: jhalfs/trunk/pkgmngt/packInstall.sh.dpkg
==============================================================================
--- jhalfs/trunk/pkgmngt/packInstall.sh.dpkg Sun Jul 5 22:38:54 2020
(r4185)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.dpkg Sun Jul 5 22:44:22 2020
(r4186)
@@ -6,7 +6,7 @@
local PCKGVRS=$(basename $PKGDIR)
local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{2\}-//')
case $PCKGVRS in
expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;
Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==============================================================================
--- jhalfs/trunk/pkgmngt/packInstall.sh.porg Sun Jul 5 22:38:54 2020
(r4185)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porg Sun Jul 5 22:44:22 2020
(r4186)
@@ -107,7 +107,7 @@
# but it does not hurt, either.
local PCKGVRS=$(basename $PKGDIR)
local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{2\}-//')
# Porg converts package names to lowercase anyway, so do the conversion
# ourselves
@@ -126,7 +126,7 @@
# With porg, we need only the package name to make the tarball
local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{1\}-//')
local PCKGVRS=$(basename $PKGDIR)
# Porg converts package names to lowercase anyway, so do the conversion
Modified: jhalfs/trunk/pkgmngt/packInstall.sh.template
==============================================================================
--- jhalfs/trunk/pkgmngt/packInstall.sh.template Sun Jul 5 22:38:54
2020 (r4185)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.template Sun Jul 5 22:44:22
2020 (r4186)
@@ -8,7 +8,7 @@
# A proposed implementation for versions and package names.
local PCKGVRS=$(basename $PKGDIR)
local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{2\}-//')
# version is only accessible from PKGDIR name. Since the format of the
# name is not normalized, several hacks are necessary...
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
