Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-27 09:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix setupmultilib script

Browse source 
Fix a regression on TAG PRIORITY
This commit is contained in:
Matteo Rossini 2018-06-15 10:07:24 +02:00
parent fe431e228f
commit ccb6be0593
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/setupmultilib.sh
View file

@ -15,18 +15,18 @@ if [ $ISX64 -ne 1 ];then
echo "Slackware multilib's are supported only from slackware x86_64!" echo "Slackware multilib's are supported only from slackware x86_64!"
exit 1 exit 1
fi fi
SVER=$(grep -v ^\# $CONF/mirrors|sed -r 's,^.*/slackware64-(current|14.1|14.0|13.37|13.0)/,\1,'|head -1) SVER=$(grep -v ^\# $CONF/mirrors|sed -r 's,^.*/slackware64-(current|14.2|14.1|14.0)/,\1,'|head -1)
if [ -z "$SVER" ];then if [ -z "$SVER" ];then
echo "I can't detect your Slackware version." echo "I can't detect your Slackware version."
echo "Which Slackware version are you running? (current/14.1/14.0/13.37/13.0)" echo "Which Slackware version are you running? (current/14.2/14.1/14.0)"
read $SVER read $SVER
fi fi
if ! echo $SVER|egrep -q '^(current|14.1|14.0|13.37|13.0)$';then if ! echo $SVER|egrep -q '^(current|14.2|14.1|14.0|13.37|13.0)$';then
echo "Invalid Slackware version ($SVER)" echo "Invalid Slackware version ($SVER)"
exit 1 exit 1
fi fi
if grep -q -e '^PKGS_PRIORITY=.* multilib:\.\* .*$' -e '^MIRRORPLUS..multilib..=.*multilib.*' $CONF/slackpkgplus.conf;then if grep -q -e '^PKGS_PRIORITY=.* multilib .*$' -e '^MIRRORPLUS..multilib..=.*multilib.*' $CONF/slackpkgplus.conf;then
echo "slackpkg+ seems to be already configured for multilib support. Would you like to remove multilib support from the configuration? (y/N)" echo "slackpkg+ seems to be already configured for multilib support. Would you like to remove multilib support from the configuration? (y/N)"
read ANS read ANS
if [ "$ANS" == "y" -o "$ANS" == "Y" ];then if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
@ -65,9 +65,9 @@ if [ "$ANS" == "y" -o "$ANS" == "Y" ];then
MULTILIBREPO="MIRRORPLUS['multilib']="$(grep -m1 '> multilib: ' repositories.txt|awk '{print $3}'|sed "s/{.*}/$SVER/") MULTILIBREPO="MIRRORPLUS['multilib']="$(grep -m1 '> multilib: ' repositories.txt|awk '{print $3}'|sed "s/{.*}/$SVER/")
cp $CONF/slackpkgplus.conf $CONF/slackpkgplus.conf.backup cp $CONF/slackpkgplus.conf $CONF/slackpkgplus.conf.backup
if grep -q ^PKGS_PRIORITY= $CONF/slackpkgplus.conf;then if grep -q ^PKGS_PRIORITY= $CONF/slackpkgplus.conf;then
sed -i -r -e 's/^PKGS_PRIORITY=\( (.*) \)/PKGS_PRIORITY=( multilib:.* \1 )/' $CONF/slackpkgplus.conf sed -i -r -e 's/^PKGS_PRIORITY=\( (.*) \)/PKGS_PRIORITY=( multilib \1 )/' $CONF/slackpkgplus.conf
else else
sed -i -r -e '1,/^#PKGS_PRIORITY=.*$/s/^(#PKGS_PRIORITY=.*)$/\1\nPKGS_PRIORITY=( multilib: )\n/' $CONF/slackpkgplus.conf sed -i -r -e '1,/^#PKGS_PRIORITY=.*$/s/^(#PKGS_PRIORITY=.*)$/\1\nPKGS_PRIORITY=( multilib )\n/' $CONF/slackpkgplus.conf
fi fi
sed -i -r -e 's|^(PKGS_PRIORITY=.*)$|\1\n'"$MULTILIBREPO|" $CONF/slackpkgplus.conf sed -i -r -e 's|^(PKGS_PRIORITY=.*)$|\1\n'"$MULTILIBREPO|" $CONF/slackpkgplus.conf
sed -i.backup -r -e 's/^(\[0-9\]\+compat32)$/\#\1/' $CONF/blacklist sed -i.backup -r -e 's/^(\[0-9\]\+compat32)$/\#\1/' $CONF/blacklist

2
src/slackpkgplus.sh
View file

@ -909,7 +909,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if [ "$AUTOP" == "on" ] ; then if [ "$AUTOP" == "on" ] ; then
PKGINFOS=$( PKGINFOS=$(
( cd $ROOT/ ; ls -1 ./var/log/packages/$ARGUMENT-*-*-* 2>/dev/null ) | awk -f /usr/libexec/slackpkg/pkglist.awk| ( cd $ROOT/ ; ls -1 ./var/log/packages/$ARGUMENT-*-*-* 2>/dev/null ) | awk -f /usr/libexec/slackpkg/pkglist.awk|
grep " $ARGUMENT "|awk '{print $1,$4}'| grep " $ARGUMENT "|awk '{print $2,$5}'|
( read X && ( ( read X && (
echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1 /' -e 's/^/ /' echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1 /' -e 's/^/ /'
echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1_slack[0-9]/' -e 's/^/ /' echo "$X"|sed -r -e 's/ [0-9]+([^0-9].*)*$/ [^ ]\\+ [^ ]\\+ [0-9]\\+\1_slack[0-9]/' -e 's/^/ /'