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

Allow scriptlet numbering to be on 4 digits in packInstall.sh*

Browse source
This commit is contained in:
Pierre Labastie 2020-07-06 05:44:22 +00:00
parent 3ac3ae199f
commit 89bcb1be0e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgmngt/packInstall.sh.dpkg
View file

@ -6,7 +6,7 @@ packInstall() {
local PCKGVRS=$(basename $PKGDIR) 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,4\}-//' |
sed 's/^[0-9]\{2\}-//') sed 's/^[0-9]\{2\}-//')
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]*//') ;;

4
pkgmngt/packInstall.sh.porg
View file

@ -107,7 +107,7 @@ wrapInstall() {
# but it does not hurt, either. # but it does not hurt, either.
local PCKGVRS=$(basename $PKGDIR) 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,4\}-//' |
sed 's/^[0-9]\{2\}-//') sed 's/^[0-9]\{2\}-//')
# Porg converts package names to lowercase anyway, so do the conversion # Porg converts package names to lowercase anyway, so do the conversion
# ourselves # ourselves
@ -126,7 +126,7 @@ packInstall() {
# With porg, we need only the package name to make the tarball # With porg, we need only the package name to make the tarball
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,4\}-//' |
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 # Porg converts package names to lowercase anyway, so do the conversion

2
pkgmngt/packInstall.sh.template
View file

@ -8,7 +8,7 @@ packInstall() {
# A proposed implementation for versions and package names. # A proposed implementation for versions and package names.
local PCKGVRS=$(basename $PKGDIR) 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,4\}-//' |
sed 's/^[0-9]\{2\}-//') sed 's/^[0-9]\{2\}-//')
# 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...