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

slackpkg 2.83.0beta changed how to manage $ROOT.

Browse source 
This break slackpkg+ management of $ROOT.
However this commit fix slackpkg+ if $ROOT is empty.
It's impossible a full fix (to make $ROOT working) until slackpkg-2.83
will be released into slackware official branch.
This commit is contained in:
Matteo Rossini 2018-04-15 23:25:15 +02:00
parent d87d24bf0f
commit 4d15d1a5f8
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/slackpkgplus.sh
View file

@ -785,7 +785,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
elif [ ${FILENAME:0:13} == "CHECKSUMS.md5" ];then elif [ ${FILENAME:0:13} == "CHECKSUMS.md5" ];then
REPO=$(echo $FILENAME|cut -f2- -d-|sed 's/\.gz$//') REPO=$(echo $FILENAME|cut -f2- -d-|sed 's/\.gz$//')
else else
REPO=$(echo $1|sed -r -e "s,^$TEMP,/," -e "s,/\./,/,g" -e "s,//,/,g" -e "s,^/,," -e "s,/.*$,," -e "s,SLACKPKGPLUS_,,") REPO=$(echo $1|sed -r -e "s,^/*$TEMP,/," -e "s,/\./,/,g" -e "s,//,/,g" -e "s,^/,," -e "s,/.*$,," -e "s,SLACKPKGPLUS_,,")
fi fi
if [ "$STRICTGPG" != "off" ] && ! echo ${MIRRORPLUS[$REPO]}|grep -q ^dir:/;then if [ "$STRICTGPG" != "off" ] && ! echo ${MIRRORPLUS[$REPO]}|grep -q ^dir:/;then
@ -840,7 +840,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo 1 echo 1
return return
fi fi
ARG=$(echo $1|sed "s|^$TEMP/||") ARG=$(echo $1|sed "s|^/*$TEMP/||")
PREPO=$(echo $ARG | cut -f2 -d/|sed 's/SLACKPKGPLUS_//' ) PREPO=$(echo $ARG | cut -f2 -d/|sed 's/SLACKPKGPLUS_//' )
if echo ${MIRRORPLUS[$PREPO]}|grep -q ^dir:/;then if echo ${MIRRORPLUS[$PREPO]}|grep -q ^dir:/;then
echo 1 echo 1
@ -887,7 +887,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
AUTOP=no AUTOP=no
if [[ "$CMD" == "upgrade" || "$CMD" == "upgrade-all" ]];then if [[ "$CMD" == "upgrade" || "$CMD" == "upgrade-all" ]];then
( cd $ROOT/var/log/packages (
( cd $ROOT/ ; ls -1 ./var/log/packages/$ARGUMENT-*-*-* 2>/dev/null ) | awk -f /usr/libexec/slackpkg/pkglist.awk|grep -q " $ARGUMENT " ( cd $ROOT/ ; ls -1 ./var/log/packages/$ARGUMENT-*-*-* 2>/dev/null ) | awk -f /usr/libexec/slackpkg/pkglist.awk|grep -q " $ARGUMENT "
)||return )||return
if [ ! -z "$AUTOPRIORITY" ];then if [ ! -z "$AUTOPRIORITY" ];then
@ -904,7 +904,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi fi
if [ "$AUTOP" == "on" ] ; then if [ "$AUTOP" == "on" ] ; then
PKGINFOS=$( PKGINFOS=$(
cd $ROOT/var/log/packages
( 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 $1,$4}'|
( read X && ( ( read X && (