From 3faf067c4478222ba8a5d615f7046bb58f334ecb Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Mon, 21 Feb 2022 12:24:36 +0100 Subject: [PATCH] Fix packInstall.sh.porg for non versioned x26[45] --- pkgmngt/packInstall.sh.porg | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgmngt/packInstall.sh.porg b/pkgmngt/packInstall.sh.porg index ed0e193..88265e2 100644 --- a/pkgmngt/packInstall.sh.porg +++ b/pkgmngt/packInstall.sh.porg @@ -69,8 +69,13 @@ case $1 in btrfs*|node*|pnmixer*|docbook-v*) VERSION=$(echo $1 | sed 's/^.*v//') ;; - x265*) # can contain vd.d or just d.d: thanks to packagers - VERSION=$(echo $1 | sed 's/^.*[v_]//') + x264*) # can contain vd.d or just d.d, and now our package is not versioned! + local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent + VERSION=$(sed -n 's/.*x264[^0-9]*\([^"]*\).*/\1/p' $PACKENT) + ;; + x265*) # can contain vd.d or just d.d, and now our package is not versioned! + local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent + VERSION=$(sed -n 's/.*x265[^0-9]*\([^"]*\).*/\1/p' $PACKENT) ;; libuv*|Test-MockModule*) # can contain -vd.d or just -d.d VERSION=$(echo $1 | sed 's/^.*[v-]//')