mirror of
https://github.com/zuno/slackpkgplus
synced 2025-01-13 20:01:04 +01:00
Current
- speed up the update process - allow to disable the download status bar
This commit is contained in:
parent
7400405069
commit
77cbaa351c
5 changed files with 36 additions and 23 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Current
|
||||||
|
- speed up the update process
|
||||||
|
- allow to disable the download status bar
|
||||||
|
|
||||||
Version 0.9.1 - 05/May/2013
|
Version 0.9.1 - 05/May/2013
|
||||||
- fixed an error when a folder is missing in the slackware mirror (as
|
- fixed an error when a folder is missing in the slackware mirror (as
|
||||||
/testing).
|
/testing).
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
Current
|
||||||
|
- speed up the update process
|
||||||
|
- allow to disable the download status bar
|
||||||
|
|
||||||
Version 0.9.1 - 05/May/2013
|
Version 0.9.1 - 05/May/2013
|
||||||
- fixed an error when a folder is missing in the slackware mirror (as
|
- fixed an error when a folder is missing in the slackware mirror (as
|
||||||
/testing).
|
/testing).
|
||||||
|
|
|
@ -40,18 +40,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $(basename $1) = "CHECKSUMS.md5" ];then
|
|
||||||
for PREPO in $REPOPLUS;do
|
|
||||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
|
|
||||||
if echo $URLFILE | grep -q "^file://" ; then
|
|
||||||
URLFILE=${URLFILE:6}
|
|
||||||
cp -v $URLFILE $2-$PREPO
|
|
||||||
else
|
|
||||||
$DOWNLOADER $2-$PREPO $URLFILE
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $(basename $1) = "CHECKSUMS.md5.asc" ];then
|
if [ $(basename $1) = "CHECKSUMS.md5.asc" ];then
|
||||||
if [ "$CHECKGPG" = "on" ];then
|
if [ "$CHECKGPG" = "on" ];then
|
||||||
for PREPO in $REPOPLUS;do
|
for PREPO in $REPOPLUS;do
|
||||||
|
@ -89,16 +77,15 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
||||||
fi
|
fi
|
||||||
if [ $(basename $1) = "ChangeLog.txt" ];then
|
if [ $(basename $1) = "ChangeLog.txt" ];then
|
||||||
for PREPO in $REPOPLUS;do
|
for PREPO in $REPOPLUS;do
|
||||||
# Not all repositories have the ChangeLog.txt, so I use md5 of PACKAGES.TXT instead
|
# Not all repositories have the ChangeLog.txt, so I use md5 of CHECKSUMS.md5 instead
|
||||||
URLFILE=${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}PACKAGES.TXT
|
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}
|
||||||
cp -v $URLFILE $2-tmp
|
cp -v $URLFILE ${TMPDIR}/CHECKSUMS.md5-$PREPO
|
||||||
else
|
else
|
||||||
$DOWNLOADER $2-tmp ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}PACKAGES.TXT
|
$DOWNLOADER ${TMPDIR}/CHECKSUMS.md5-$PREPO ${MIRRORPLUS[${PREPO/SLACKPKGPLUS_}]}CHECKSUMS.md5
|
||||||
fi
|
fi
|
||||||
echo $PREPO $(md5sum $2-tmp|awk '{print $1}') >>$2
|
echo $PREPO $(md5sum ${TMPDIR}/CHECKSUMS.md5-$PREPO|awk '{print $1}') >>$2
|
||||||
rm $2-tmp
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
if [ $(basename $1) = "GPG-KEY" ];then
|
if [ $(basename $1) = "GPG-KEY" ];then
|
||||||
|
@ -221,11 +208,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
||||||
|
|
||||||
touch ${TMPDIR}/waiting
|
touch ${TMPDIR}/waiting
|
||||||
|
|
||||||
# -- PKGLIST:
|
# -- PKGLIST:
|
||||||
# temporary file used to store data about packages. It use
|
# temporary file used to store data about packages. It use
|
||||||
# the following format:
|
# the following format:
|
||||||
# repository:<repository_name>:basename:<package_basename>:
|
# repository:<repository_name>:basename:<package_basename>:
|
||||||
#
|
#
|
||||||
PKGLIST=$(tempfile --directory=$TMPDIR)
|
PKGLIST=$(tempfile --directory=$TMPDIR)
|
||||||
PKGINFOS=$(tempfile --directory=$TMPDIR)
|
PKGINFOS=$(tempfile --directory=$TMPDIR)
|
||||||
|
|
||||||
|
@ -384,6 +371,13 @@ if [ "$SLACKPKGPLUS" = "on" ];then
|
||||||
if [ -z "$DOWNLOADER" ];then
|
if [ -z "$DOWNLOADER" ];then
|
||||||
DOWNLOADER="wget --passive-ftp -O"
|
DOWNLOADER="wget --passive-ftp -O"
|
||||||
fi
|
fi
|
||||||
|
if [ "$VERBOSE" = "0" ];then
|
||||||
|
DOWNLOADER="wget -nv --passive-ftp -O"
|
||||||
|
elif [ "$VERBOSE" = "2" ];then
|
||||||
|
DOWNLOADER="wget --passive-ftp -O"
|
||||||
|
elif [ "$CMD" = "update" ];then
|
||||||
|
DOWNLOADER="wget -nv --passive-ftp -O"
|
||||||
|
fi
|
||||||
|
|
||||||
# Global variable required by givepriority()
|
# Global variable required by givepriority()
|
||||||
#
|
#
|
||||||
|
|
|
@ -2,6 +2,12 @@
|
||||||
# Enable (on) / Disable (off) slackpkg+
|
# Enable (on) / Disable (off) slackpkg+
|
||||||
SLACKPKGPLUS=on
|
SLACKPKGPLUS=on
|
||||||
|
|
||||||
|
# set to '0' to never show the download progress bar
|
||||||
|
# set to '1' to show the bar only in download packages (default)
|
||||||
|
# set to '2' to show always show the download bar
|
||||||
|
VERBOSE=1
|
||||||
|
|
||||||
|
|
||||||
# If two or more repositories contains some same packages, you can specify
|
# If two or more repositories contains some same packages, you can specify
|
||||||
# from which repository you prefer to search it.
|
# from which repository you prefer to search it.
|
||||||
# The syntax is "<repository_name>:<package_name>"
|
# The syntax is "<repository_name>:<package_name>"
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
# Enable (on) / Disable (off) slackpkg+
|
# Enable (on) / Disable (off) slackpkg+
|
||||||
SLACKPKGPLUS=on
|
SLACKPKGPLUS=on
|
||||||
|
|
||||||
|
# set to '0' to never show the download progress bar
|
||||||
|
# set to '1' to show the bar only in download packages (default)
|
||||||
|
# set to '2' to show always show the download bar
|
||||||
|
VERBOSE=1
|
||||||
|
|
||||||
# If two or more repositories contains some same packages, you can specify
|
# If two or more repositories contains some same packages, you can specify
|
||||||
# from which repository you prefer to search it.
|
# from which repository you prefer to search it.
|
||||||
# The syntax is "<repository_name>:<package_name>"
|
# The syntax is "<repository_name>:<package_name>"
|
||||||
|
|
Loading…
Reference in a new issue