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

Regression by using links

Browse source
This commit is contained in:
Matteo Rossini 2021-05-14 17:26:47 +02:00
parent 59917f1dc5
commit 28f744ad66
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/slackpkgplus.sh
View file

@ -564,8 +564,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
[[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE" [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE $2 ln -s $URLFILE $2
else else
echo -e "\tNot found $URLFILE" return 1
false
fi fi
elif echo $URLFILE|grep -q -E dir:/.*asc$;then elif echo $URLFILE|grep -q -E dir:/.*asc$;then
return 0 return 0
@ -623,9 +622,15 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo -n "SLACKPKGPLUS_$PREPO[MD5] " >> ${TMPDIR}/CHECKSUMS.md5.asc echo -n "SLACKPKGPLUS_$PREPO[MD5] " >> ${TMPDIR}/CHECKSUMS.md5.asc
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
[[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE" if [ -f $URLFILE ];then
ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc|awk '{print $1}' >> ${TMPDIR}/CHECKSUMS.md5.asc ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc
md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc|awk '{print $1}' >> ${TMPDIR}/CHECKSUMS.md5.asc
else
echo -e "\tNot found $URLFILE"
echo "invalid" >> ${TMPDIR}/CHECKSUMS.md5.asc
false
fi
continue continue
fi fi
$DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc $URLFILE $DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO.asc $URLFILE
@ -691,8 +696,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
[[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE" if [ -e $URLFILE ];then
ln -s $URLFILE ${TMPDIR}/$CLOGNAM [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE ${TMPDIR}/$CLOGNAM
fi
else else
if [ $VERBOSE -gt 2 ];then if [ $VERBOSE -gt 2 ];then
$DOWNLOADER ${TMPDIR}/$CLOGNAM $URLFILE $DOWNLOADER ${TMPDIR}/$CLOGNAM $URLFILE
@ -731,8 +738,13 @@ if [ "$SLACKPKGPLUS" = "on" ];then
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5 URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
if echo $URLFILE | grep -q "^file://" ; then if echo $URLFILE | grep -q "^file://" ; then
URLFILE=${URLFILE:6} URLFILE=${URLFILE:6}
[[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE" if [ -f $URLFILE ];then
ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO
else
echo -e "\tNot found $URLFILE"
false
fi
elif echo $URLFILE | grep -q "^dir:/" ; then elif echo $URLFILE | grep -q "^dir:/" ; then
touch ${TMPDIR}/CHECKSUMS.md5-$PREPO touch ${TMPDIR}/CHECKSUMS.md5-$PREPO
continue continue
@ -817,8 +829,13 @@ 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}
[[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE" if [ -f $URLFILE ];then
ln -s $URLFILE $2-tmp-$PREPO [[ "$FLAG" == "-q" || ! "$WGETOPTS" =~ -q ]]&&echo -e "\tLinking $URLFILE"
ln -s $URLFILE $2-tmp-$PREPO
else
echo -e "\tNot found $URLFILE"
false
fi
elif echo $URLFILE |grep -q "dir:/";then elif echo $URLFILE |grep -q "dir:/";then
continue continue
else else