Version 1.6.1 - 20/Dec/2015

- Added DOWNLOADONLY to just download packages without installing it
This commit is contained in:
Matteo Rossini 2015-12-20 13:26:19 +01:00
parent 29ee081622
commit ef1e7bacb5
7 changed files with 59 additions and 6 deletions

View file

@ -1,3 +1,6 @@
Version 1.6.1 - 20/Dec/2015
- Added DOWNLOADONLY to just download packages without installing it
Version 1.6.0 - 19/Dec/2015 Version 1.6.0 - 19/Dec/2015
- Added CACHEUPDATE. You can now speedup the slackpkg update by caching - Added CACHEUPDATE. You can now speedup the slackpkg update by caching
metadata files. metadata files.
@ -21,7 +24,7 @@ Version 1.5.1 - 20/Nov/2015
Note for Slackware 14.1 users: slackware-current introduce important bug fix Note for Slackware 14.1 users: slackware-current introduce important bug fix
in slackpkg 2.82.0-14 (see Slackware ChangeLog) not backported in slackware in slackpkg 2.82.0-14 (see Slackware ChangeLog) not backported in slackware
14.1; it is not mandatory but you are encouraged to upgrade it by download it 14.1; it is not mandatory but you are encouraged to upgrade it by download it
manually; be sure to graylist slackpkg to avoid an automatic downgrade. manually; be sure to greylist slackpkg to avoid an automatic downgrade.
- The trailing slash in MIRRORPLUS[] is now optional (thanks to phenixia2003 - The trailing slash in MIRRORPLUS[] is now optional (thanks to phenixia2003
and Didier Spaier) and Didier Spaier)
- Added DOWNLOADCMD option to add a custom downloader - Added DOWNLOADCMD option to add a custom downloader

View file

@ -1,3 +1,6 @@
Version 1.6.1 - 20/Dec/2015
- Added DOWNLOADONLY to just download packages without installing it
Version 1.6.0 - 19/Dec/2015 Version 1.6.0 - 19/Dec/2015
- Added CACHEUPDATE. You can now speedup the slackpkg update by caching - Added CACHEUPDATE. You can now speedup the slackpkg update by caching
metadata files. metadata files.
@ -21,7 +24,7 @@ Version 1.5.1 - 20/Nov/2015
Note for Slackware 14.1 users: slackware-current introduce important bug fix Note for Slackware 14.1 users: slackware-current introduce important bug fix
in slackpkg 2.82.0-14 (see Slackware ChangeLog) not backported in slackware in slackpkg 2.82.0-14 (see Slackware ChangeLog) not backported in slackware
14.1; it is not mandatory but you are encouraged to upgrade it by download it 14.1; it is not mandatory but you are encouraged to upgrade it by download it
manually; be sure to graylist slackpkg to avoid an automatic downgrade. manually; be sure to greylist slackpkg to avoid an automatic downgrade.
- The trailing slash in MIRRORPLUS[] is now optional (thanks to phenixia2003 - The trailing slash in MIRRORPLUS[] is now optional (thanks to phenixia2003
and Didier Spaier) and Didier Spaier)
- Added DOWNLOADCMD option to add a custom downloader - Added DOWNLOADCMD option to add a custom downloader

View file

@ -424,6 +424,26 @@ the file.
Set CACHEUPDATE=on to enable it. Default is 'off' Set CACHEUPDATE=on to enable it. Default is 'off'
-----
DOWNLOADONLY Option
Sometimes may be useful to just download only the packages, and in a second moment
install it. For example for large upgrades I can download all in the night while
I sleep and then install all in the morning.
Also it is good when the 'install-new' give you a large list of packages to install.
You can set DOWNLOANDONLY=on in slackpkgplus.conf to do that or use it in cmdline.
For example, to upgrading from slackware 14.1 to slackware 14.2:
# DOWNLOADONLY=on slackpkg install-new
# DOWNLOADONLY=on slackpkg upgrade-all
# slackpkg install-new
# slackpkg upgrade-all
# slackpkg clean-system
----- -----
ALLOW32BIT ALLOW32BIT
@ -446,8 +466,8 @@ Sometime you may want that slackpkg+ does not install some package in the upgrad
process. To do that you must uncheck the package everytime or add it in the process. To do that you must uncheck the package everytime or add it in the
'blacklist' file. The first method may be onerous when you use upgrade-all frequently. 'blacklist' file. The first method may be onerous when you use upgrade-all frequently.
The second method does not allow you to know which package version is available. The second method does not allow you to know which package version is available.
A thirdy method is to put it in the 'graylist' file. A thirdy method is to put it in the 'greylist' file.
All packages listed in graylist will be available to install and listed in slackpkg All packages listed in greylist will be available to install and listed in slackpkg
dialog, but they will be unchecked by default so you are sure to not install it dialog, but they will be unchecked by default so you are sure to not install it
wrongly. wrongly.
You may decide also to greylist one entire repository. A good idea is to greylist You may decide also to greylist one entire repository. A good idea is to greylist

View file

@ -22,6 +22,7 @@ if [ -e $CONF/slackpkgplus.conf ];then
EXTTAG_PRIORITY=$TAG_PRIORITY EXTTAG_PRIORITY=$TAG_PRIORITY
EXTSENSITIVE_SEARCH=$SENSITIVE_SEARCH EXTSENSITIVE_SEARCH=$SENSITIVE_SEARCH
EXTCACHEUPDATE=$CACHEUPDATE EXTCACHEUPDATE=$CACHEUPDATE
EXTDOWNLOADONLY=$DOWNLOADONLY
. $CONF/slackpkgplus.conf . $CONF/slackpkgplus.conf
@ -35,6 +36,7 @@ if [ -e $CONF/slackpkgplus.conf ];then
TAG_PRIORITY=${EXTTAG_PRIORITY:-$TAG_PRIORITY} TAG_PRIORITY=${EXTTAG_PRIORITY:-$TAG_PRIORITY}
SENSITIVE_SEARCH=${EXTSENSITIVE_SEARCH:-$SENSITIVE_SEARCH} SENSITIVE_SEARCH=${EXTSENSITIVE_SEARCH:-$SENSITIVE_SEARCH}
CACHEUPDATE=${EXTCACHEUPDATE:-$CACHEUPDATE} CACHEUPDATE=${EXTCACHEUPDATE:-$CACHEUPDATE}
DOWNLOADONLY=${EXTDOWNLOADONLY:-$DOWNLOADONLY}
USEBLACKLIST=true USEBLACKLIST=true
if [ "$USEBL" == "0" ];then if [ "$USEBL" == "0" ];then
@ -47,13 +49,18 @@ fi
if [ "$SLACKPKGPLUS" = "on" ];then if [ "$SLACKPKGPLUS" = "on" ];then
if [ "$DOWNLOADONLY" == "on" ];then
DELALL=off
DOWNLOAD_ALL=on
fi
if [ -z "$VERBOSE" ];then if [ -z "$VERBOSE" ];then
VERBOSE=1 VERBOSE=1
fi fi
SPKGPLUS_VERSION="1.6.0" SPKGPLUS_VERSION="1.6.1"
VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION" VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"
@ -892,6 +899,10 @@ function showlist() {
done done
DELALL="$OLDDEL" DELALL="$OLDDEL"
fi fi
if [ "$DOWNLOADONLY" == "on" ];then
echo "Download only.. not upgraded!"
return
fi
ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist
for i in $SHOWLIST; do for i in $SHOWLIST; do
@ -919,6 +930,10 @@ function showlist() {
done done
DELALL="$OLDDEL" DELALL="$OLDDEL"
fi fi
if [ "$DOWNLOADONLY" == "on" ];then
echo "Download only.. not installed!"
return
fi
for i in $SHOWLIST; do for i in $SHOWLIST; do
INSTALL_T='installed: ' INSTALL_T='installed: '
if [ -e $ROOT/var/log/packages/$(echo $i|sed 's/\.t.z//') ];then if [ -e $ROOT/var/log/packages/$(echo $i|sed 's/\.t.z//') ];then

View file

@ -26,6 +26,10 @@ WGETOPTS="--timeout=20 --tries=2"
# process by downloading just new files (see README). Disabled by default (off) # process by downloading just new files (see README). Disabled by default (off)
CACHEUPDATE=off CACHEUPDATE=off
# You can download-only by setting DOWNLOADONLY to 'on'. You may (you should) also use it in commandline
# for example: "DOWNLOADONLY=on slackpkg upgrade-all". Useful for large upgrades.
#DOWNLOADONLY=off
# Enable (on) / Disable (off) notification events (see notifymsg.conf) # Enable (on) / Disable (off) notification events (see notifymsg.conf)
#ENABLENOTIFY=off #ENABLENOTIFY=off

View file

@ -34,6 +34,10 @@ WGETOPTS="--timeout=20 --tries=2"
# process by downloading just new files (see README). Disabled by default (off) # process by downloading just new files (see README). Disabled by default (off)
CACHEUPDATE=off CACHEUPDATE=off
# You can download-only by setting DOWNLOADONLY to 'on'. You may (you should) also use it in commandline
# for example: "DOWNLOADONLY=on slackpkg upgrade-all". Useful for large upgrades.
#DOWNLOADONLY=off
# Enable (on) / Disable (off) notification events (see notifymsg.conf) # Enable (on) / Disable (off) notification events (see notifymsg.conf)
#ENABLENOTIFY=off #ENABLENOTIFY=off

View file

@ -75,7 +75,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
awk '{ NF=3 ; print $0 }' $TMPDIR/dialog2.tmp > $TMPDIR/dialog.tmp awk '{ NF=3 ; print $0 }' $TMPDIR/dialog2.tmp > $TMPDIR/dialog.tmp
HINT="" HINT=""
fi fi
cat $TMPDIR/dialog.tmp|xargs dialog --title $2 --backtitle "slackpkg $VERSION" $HINT --checklist "Choose packages to $2:" 19 70 13 2>$TMPDIR/dialog.out DTITLE=$2
if [ "$DOWNLOADONLY" == "on" ];then
DTITLE="$DTITLE (download only)"
fi
cat $TMPDIR/dialog.tmp|xargs dialog --title "$DTITLE" --backtitle "slackpkg $VERSION" $HINT --checklist "Choose packages to $2:" 19 70 13 2>$TMPDIR/dialog.out
case "$?" in case "$?" in
0|123) 0|123)
dialog --clear dialog --clear