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

Setting up mainline branch.

Browse source 
- Fixed some typos and missed SEARCH_CLOG_INPARENT documentation in README
  - Suppress wget output in ChangeLog downloading
  - Fixed an issue when an invalid repository is configured
This commit is contained in:
Matteo Rossini 2016-06-15 00:44:52 +02:00
parent 72b205aad8
commit 9e9b06446b
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.txt
View file

@ -2,6 +2,8 @@ Tue Jun 12 20:11:00 CEST 2016
pkg/slackpkg+-1.7.0d0-noarch-1mt.txz: Upgraded
Setting up mainline branch.
- Fixed some typos and missed SEARCH_CLOG_INPARENT documentation in README
- Suppress wget output in ChangeLog downloading
- Fixed an issue when an invalid repository is configured
+-------------------------+
Version 1.7.0rc3 - 03/Jun/2016

2
src/ChangeLog.txt
View file

@ -2,6 +2,8 @@ Tue Jun 12 20:11:00 CEST 2016
pkg/slackpkg+-1.7.0d0-noarch-1mt.txz: Upgraded
Setting up mainline branch.
- Fixed some typos and missed SEARCH_CLOG_INPARENT documentation in README
- Suppress wget output in ChangeLog downloading
- Fixed an issue when an invalid repository is configured
+-------------------------+
Version 1.7.0rc3 - 03/Jun/2016

14
src/slackpkgplus.sh
View file

@ -398,7 +398,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
CURREPO=slackware
fi
echo -n " File: $CURREPO->$SRCBASE .."
[ $SRCBASE != "ChangeLog.txt" ]||[ -z "$LEVEL" -o "$LEVEL" == "1" ]&&echo -n " File: $CURREPO->$SRCBASE .."
[ $VERBOSE -eq 3 ]&&echo -n " ($CACHEFILE) "
if [ $TOCACHE -eq 1 ];then
echo -n "." # ... -> tocache=1
@ -408,7 +408,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
[ $VERBOSE -eq 3 ]&&(echo;cat $TMPDIR/cache.head|sed 's/^/ /')
if grep -q "^HTTP/.* 404" $TMPDIR/cache.head;then
if [ $SRCBASE == "ChangeLog.txt" ]&&[ $LEVEL -lt $LIMIT ];then
echo " Trying parent URL ($LEVEL) "
echo -n
else
echo " Not Found."
fi
@ -620,7 +620,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
URLFILE=${URLFILE:6}
cp -v $URLFILE ${TMPDIR}/$CLOGNAM
else
$DOWNLOADER ${TMPDIR}/$CLOGNAM $URLFILE
if [ $VERBOSE -gt 2 ];then
$DOWNLOADER ${TMPDIR}/$CLOGNAM $URLFILE
else
$DOWNLOADER ${TMPDIR}/$CLOGNAM $URLFILE 2>/dev/null
fi
fi
((LEVEL++))
@ -672,8 +676,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo -e "$PREPO: SKIPPING Invalid repository (fails to download CHECKSUMS.md5)" >> $TMPDIR/error.log
echo " ( ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5 )" >> $TMPDIR/error.log
PRIORITY=( $(echo ${PRIORITY[*]}" "|sed "s/SLACKPKGPLUS_$PREPO //") )
REPOPLUS=( $(echo " "${REPOPLUS[*]}" "|sed "s/ $PREPO //") )
PRIORITY=( $(echo ${PRIORITY[*]}" "|sed "s/SLACKPKGPLUS_$PREPO / /") )
REPOPLUS=( $(echo " "${REPOPLUS[*]}" "|sed "s/ $PREPO / /") )
else
echo "SLACKPKGPLUS_$PREPO[MD5]" $(md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO|awk '{print $1}') >>$2
fi