diff --git a/ChangeLog.txt b/ChangeLog.txt index a821b52..427df1a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,16 @@ +Tue Oct 26 10:10:23 CEST 2021 +pkg/slackpkg+-1.7.9-noarch-1mt.txz: + - According to slackpkg 15.0.8 new exit codes was added in slackpkg+ too: + 0 Successful Slackpkg execution. + 1 Something wrong happened. + 2 Something fatal happened. (not available in slackpkg) + 20 No package found to be downloaded, installed, reinstalled, upgraded + or removed. + 50 Slackpkg itself was upgraded and you need to re-run it. + 100 There are pending updates. + Please: do not ignore the fatal output! ++-------------------------+ + Sat Oct 16 15:39:45 CEST 2021 pkg/slackpkg+-1.7.8-noarch-1mt.txz: - New feature: CHECKDISKSPACE=on in configuration enable checking diff --git a/src/CHANGES b/src/CHANGES index e0ddaf1..ee2303a 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,6 +1,6 @@ = Full Changes list = -== From 1.7 to 1.7.8 == +== From 1.7 to 1.7.9 == *Configuration file: @@ -50,6 +50,15 @@ - Added check diskspace before download and install packages +- Added new exit codes according to slackpkg-15.0.8 and one specific for slackpkg+ + 0 Successful Slackpkg execution. + 1 Something wrong happened. + 2 Something fatal happened, please do not ignore it. (not available in slackpkg) + 20 No package found to be downloaded, installed, reinstalled, upgraded + or removed. + 50 Slackpkg itself was upgraded and you need to re-run it. + 100 There are pending updates. + *Improvements diff --git a/src/ChangeLog.txt b/src/ChangeLog.txt index a821b52..427df1a 100644 --- a/src/ChangeLog.txt +++ b/src/ChangeLog.txt @@ -1,3 +1,16 @@ +Tue Oct 26 10:10:23 CEST 2021 +pkg/slackpkg+-1.7.9-noarch-1mt.txz: + - According to slackpkg 15.0.8 new exit codes was added in slackpkg+ too: + 0 Successful Slackpkg execution. + 1 Something wrong happened. + 2 Something fatal happened. (not available in slackpkg) + 20 No package found to be downloaded, installed, reinstalled, upgraded + or removed. + 50 Slackpkg itself was upgraded and you need to re-run it. + 100 There are pending updates. + Please: do not ignore the fatal output! ++-------------------------+ + Sat Oct 16 15:39:45 CEST 2021 pkg/slackpkg+-1.7.8-noarch-1mt.txz: - New feature: CHECKDISKSPACE=on in configuration enable checking diff --git a/src/README b/src/README index 47e260d..0c4d70b 100644 --- a/src/README +++ b/src/README @@ -21,8 +21,8 @@ for any damage that may be caused to your computer. CONFIGURATION -see man slackpkgplus.conf. If you are italian export LANG=it_IT.UTF8 to see -the italian manpage. +see man slackpkgplus.conf. If you are italian export LANG=it_IT@euro to see +the italian manpage and set ISO8859-15 charset for the console. For the basic configuration: @@ -354,6 +354,9 @@ configuration file. As workaround you can add the options WGETOPTS="--timeout=5 --tries=1" in slackpkgplus.conf +You also add "-q" to WGETOPTS for a silent output in conjuction of +VERBOSE=0 and USETERSE=on + ----- DOWNLOADCMD Option @@ -373,11 +376,8 @@ DOWNLOADCMD="curl -o" you can add other options BEFORE the last '-o' switch: DOWNLOADCMD="curl -v -o" -If you want use a multi-connection (parallel) download, you can install aria2 -(http://aria2.sourceforge.net/) and set -DOWNLOADCMD="aria2c -x 16 -s 16 --auto-file-renaming=false --allow-overwrite=true -d / -o" -if you have proxy add -DOWNLOADCMD="aria2c --all-proxy=someproxy:8080 -x 16 -s 16 --auto-file-renaming=false --allow-overwrite=true -d / -o" +If you want use a multi-connection (parallel) download, you can use wget2 +DOWNLOADCMD="wget2 --progress=bar -O" ----- @@ -616,6 +616,24 @@ slackpkgplus.conf. ----- +CLEAN OUTPUT + +slackpkg tipically has a large amount of output that can make it few readable. +slackpkg+ added a series of features that can do a lite output. + +VERBOSE: affect wget output and some other things; '2' is the default value + for slackpkg; it make wget to print download bar both in download packages + and metadata download; '1' means download bar only in download packages so + you have a cleaner output updating metadata; '0' means no download bar, and + you will see only the url&path of file. +WGETOPTS: adding '-q' it will suppress the url&path too. +USETERSE: setting it to 'on' the slackware pkgtools just print one line in + installing/upgrading packages +TERSESEARCH: set it to 'on' or 'tiny' to have a most compact output for + slackpkg search + +----- + INSTALL LOG Slackpkg+ logs all install/remove/upgrade/reinstall actions in /var/lib/slackpkg/install.log @@ -629,6 +647,8 @@ the command "slackpkg check-updates" reports the repositories which have been ch the last update. For more details and some suggests how to use it in crontab see: http://www.linuxquestions.org/questions/showthread.php?p=5146591 +also "slackpkg check-updates" give you an exit code 50 if there are available updates. + ----- SEARCH FUNCTION IMPROVEMENT diff --git a/src/slackpkgplus.conf.5 b/src/slackpkgplus.conf.5 index 3b67b42..ed5135d 100644 --- a/src/slackpkgplus.conf.5 +++ b/src/slackpkgplus.conf.5 @@ -52,17 +52,19 @@ Here is the list of available settings: \fBDownload settings\fP -.ds 1 VERBOSE\t\t\t\t0,1,2,3\t\t1\t\tyes -.ds 2 USETERSE\t\t\t\ton/off\t\toff\t\tyes -.ds 3 PROXY\t\t\t\tstring\t\t-\t\tyes -.ds 4 WGETOPTS\t\t\t\tstring\t\t-\t\tyes -.ds 5 DOWNLOADCMD\t\t\tstring\t\twget\t\tyes -.ds 6 CHECKDISKSPACE\t\t\ton/off\t\toff\t\tno -.ds 7 DOWNLOADONLY\t\t\ton/off\t\toff\t\tyes -.ds 8 CACHEUPDATE\t\t\ton/off\t\toff\t\tyes -.ds 9 SEARCH_CLOG_INPARENT\ton/off\t\toff\t\tno -.ds 10 STRICTGPG\t\t\t\ton/off\t\ton\t\tyes +.ds 0 VERBOSE\t\t\t\t0,1,2,3\t\t1\t\tyes +.ds 1 USETERSE\t\t\t\ton/off\t\toff\t\tyes +.ds 2 PROXY\t\t\t\tstring\t\t-\t\tyes +.ds 3 WGETOPTS\t\t\t\tstring\t\t-\t\tyes +.ds 4 DOWNLOADCMD\t\t\tstring\t\twget\t\tyes +.ds 5 CHECKDISKSPACE\t\t\ton/off\t\toff\t\tno +.ds 6 DOWNLOADONLY\t\t\ton/off\t\toff\t\tyes +.ds 7 CACHEUPDATE\t\t\ton/off\t\toff\t\tyes +.ds 8 SEARCH_CLOG_INPARENT\ton/off\t\toff\t\tno +.ds 9 STRICTGPG\t\t\t\ton/off\t\ton\t\tyes .in +2 +\*0 +.br \*1 .br \*2 @@ -80,8 +82,6 @@ Here is the list of available settings: \*8 .br \*9 -.br -\*10 .in @@ -497,6 +497,22 @@ Replace first column with sometime shorter and colorized. Available value are: \fItiny\fP)\ [-] uninstalled, [I] installed, [U] upgrade, [M] uninstalled/masked .br +.SH EXIT STATUS +.P +.IP "\fB0\fP" 5 +Successful slackpkg execution. +.IP "\fB1\fP" 5 +Something wrong happened. +.IP "\fB2\fP" 5 +Something fatal happened (please do not ignore it). +.IP "\fB20\fP" 5 +No package found to be downloaded, installed, reinstalled, upgraded, or +removed. +.IP "\fB50\fP" 5 +Slackpkg itself was upgraded and you need to re-run it. +.IP "\fB100\fP" 5 +There are pending updates. + .SH FILES .TP 5 diff --git a/src/slackpkgplus.conf.5.it b/src/slackpkgplus.conf.5.it index b17a205..ec1d9c1 100644 --- a/src/slackpkgplus.conf.5.it +++ b/src/slackpkgplus.conf.5.it @@ -52,17 +52,19 @@ Seguono le differenti impostazioni disponibili: \fBImpostazioni di download\fP -.ds 1 VERBOSE\t\t\t\t0,1,2,3\t\t1\t\tsi -.ds 2 USETERSE\t\t\t\ton/off\t\toff\t\tsi -.ds 3 PROXY\t\t\t\tstringa\t\t-\t\tsi -.ds 4 WGETOPTS\t\t\t\tstringa\t\t-\t\tsi -.ds 5 DOWNLOADCMD\t\t\tstringa\t\twget\t\tsi -.ds 6 CHECKDISKSPACE\t\t\ton/off\t\toff\t\tno -.ds 7 DOWNLOADONLY\t\t\ton/off\t\toff\t\tsi -.ds 8 CACHEUPDATE\t\t\ton/off\t\toff\t\tsi -.ds 9 SEARCH_CLOG_INPARENT\ton/off\t\toff\t\tno -.ds 10 STRICTGPG\t\t\t\ton/off\t\ton\t\tsi +.ds 0 VERBOSE\t\t\t\t0,1,2,3\t\t1\t\tsi +.ds 1 USETERSE\t\t\t\ton/off\t\toff\t\tsi +.ds 2 PROXY\t\t\t\tstringa\t\t-\t\tsi +.ds 3 WGETOPTS\t\t\t\tstringa\t\t-\t\tsi +.ds 4 DOWNLOADCMD\t\t\tstringa\t\twget\t\tsi +.ds 5 CHECKDISKSPACE\t\t\ton/off\t\toff\t\tno +.ds 6 DOWNLOADONLY\t\t\ton/off\t\toff\t\tsi +.ds 7 CACHEUPDATE\t\t\ton/off\t\toff\t\tsi +.ds 8 SEARCH_CLOG_INPARENT\ton/off\t\toff\t\tno +.ds 9 STRICTGPG\t\t\t\ton/off\t\ton\t\tsi .in +2 +\*0 +.br \*1 .br \*2 @@ -81,8 +83,6 @@ Seguono le differenti impostazioni disponibili: .br \*9 .in -\*10 -.in \fBImpostazioni di ricerca\fP @@ -495,6 +495,21 @@ Mette nella prima colonna sigle pi \fItiny\fP)\ [-] uninstalled, [I] installed, [U] upgrade, [M] uninstalled/masked .br +.SH EXIT STATUS +.P +.IP "\fB0\fP" 5 +Slackpkg eseguito con successo. +.IP "\fB1\fP" 5 +Si è verificato un errore (warning). +.IP "\fB2\fP" 5 +Si è verificato un errore importante (fatal). Assicurati di gestirlo e non ignorarlo. +.IP "\fB20\fP" 5 +Nessun pacchetto disponibile al download, install, reinstall, upgrad, or remove. +.IP "\fB50\fP" 5 +Slackpkg è stato aggiornato ed è necessario riavviarlo. +.IP "\fB100\fP" 5 +Ci sono aggiornamenti disponibili. + .SH FILES .TP 5 diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 128a0c2..746a042 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -42,7 +42,7 @@ WGETOPTS="--timeout=20 --tries=2" # If you want replace wget with another downloader search DOWNLOADCMD in documentation # at /usr/doc/slackpkg+-*/README -#DOWNLOADCMD="wget -O" +#DOWNLOADCMD="wget2 --progress=bar -O" # Enable (on) / Disable (off) checking disk space to download and install packages. Default to "off" #CHECKDISKSPACE=on @@ -68,7 +68,7 @@ GREYLIST=on # Defines if commands 'search' and 'file-search' are case-sensitive (on) or not (off). Default to "on" SENSITIVE_SEARCH=off -# Defines if command 'file-search' does search Wole Word (on) of accept partial words (off). Note that +# Defines if command 'file-search' does search Whole Word (on) of accept partial words (off). Note that # you may obtains many many results searching a short partial word WW_FILE_SEARCH=off diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index bacf761..9b7ed2b 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -50,7 +50,7 @@ WGETOPTS="--timeout=20 --tries=2" # If you want replace wget with another downloader search DOWNLOADCMD in documentation # at /usr/doc/slackpkg+-*/README -#DOWNLOADCMD="wget -O" +#DOWNLOADCMD="wget2 --progress=bar -O" # Enable (on) / Disable (off) checking disk space to download and install packages. Default to "off" #CHECKDISKSPACE=on @@ -76,7 +76,7 @@ GREYLIST=on # Defines if commands 'search' and 'file-search' are case-sensitive (on) or not (off). Default to "on" SENSITIVE_SEARCH=off -# Defines if command 'file-search' does search Wole Word (on) of accept partial words (off). Note that +# Defines if command 'file-search' does search Whole Word (on) of accept partial words (off). Note that # you may obtains many many results searching a short partial word WW_FILE_SEARCH=off