Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2025-01-13 20:01:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cached_downloader did not shown correct repository name downloading GPG-KEY

Browse source
This commit is contained in:
Matteo Rossini 2016-01-15 23:04:46 +01:00
parent 0f19fac92c
commit b4583b1e12
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/slackpkgplus.sh
View file

@ -358,6 +358,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
CHECKSUMS.md5|CHECKSUMS.md5.asc) TOCACHE=1 ; CURREPO=$(basename $1|sed -r -e "s/CHECKSUMS.md5-?//" -e "s/\.asc//") ;; CHECKSUMS.md5|CHECKSUMS.md5.asc) TOCACHE=1 ; CURREPO=$(basename $1|sed -r -e "s/CHECKSUMS.md5-?//" -e "s/\.asc//") ;;
MANIFEST.bz2|PACKAGES.TXT) TOCACHE=1 ; CURREPO=$(basename $1|sed -e "s/-$SRCBASE//" -e "s/SLACKPKGPLUS_//");; MANIFEST.bz2|PACKAGES.TXT) TOCACHE=1 ; CURREPO=$(basename $1|sed -e "s/-$SRCBASE//" -e "s/SLACKPKGPLUS_//");;
ChangeLog.txt) TOCACHE=0 ;; ChangeLog.txt) TOCACHE=0 ;;
GPG-KEY) TOCACHE=0 ; CURREPO=${1/*gpgkey-tmp-/};;
FILELIST.TXT) TOCACHE=1 ;; FILELIST.TXT) TOCACHE=1 ;;
esac esac
if [ -z "$CURREPO" ]; then if [ -z "$CURREPO" ]; then
@ -588,17 +589,17 @@ if [ "$SLACKPKGPLUS" = "on" ];then
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
cp -v $URLFILE $2-tmp cp -v $URLFILE $2-tmp-$PREPO
elif echo $URLFILE |grep -q "^dir:/";then elif echo $URLFILE |grep -q "^dir:/";then
continue continue
else else
echo echo
$DOWNLOADER $2-tmp ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY $DOWNLOADER $2-tmp-$PREPO ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}GPG-KEY
fi fi
if [ $? -eq 0 ];then if [ $? -eq 0 ];then
gpg $2-tmp gpg $2-tmp-$PREPO
gpg --import $2-tmp gpg --import $2-tmp-$PREPO
gpg --output "${WORKDIR}/gpg/GPG-KEY-${PREPO}.gpg" --dearmor $2-tmp gpg --output "${WORKDIR}/gpg/GPG-KEY-${PREPO}.gpg" --dearmor $2-tmp-$PREPO
else else
echo echo
echo " !!! W A R N I N G !!!" echo " !!! W A R N I N G !!!"
@ -609,7 +610,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo echo
sleep 5 sleep 5
fi fi
rm $2-tmp rm $2-tmp-$PREPO
echo echo
done done
fi fi