From 329f32de7e69712fe3ce5204cd00ce23206b82b9 Mon Sep 17 00:00:00 2001 From: Matteo Rossini Date: Tue, 19 Oct 2021 17:15:13 +0200 Subject: [PATCH] CHECKDISKSPACE documentation --- src/CHANGES | 8 +++++++- src/README | 15 +++++++++++++++ src/slackpkgplus.conf.5 | 16 ++++++++++++---- src/slackpkgplus.conf.5.it | 16 ++++++++++++---- src/slackpkgplus.x86.sample | 3 +++ src/slackpkgplus.x86_64.sample | 3 +++ 6 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/CHANGES b/src/CHANGES index b82cdbd..e0ddaf1 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -1,6 +1,6 @@ = Full Changes list = -== From 1.7 to 1.7.7 == +== From 1.7 to 1.7.8 == *Configuration file: @@ -25,6 +25,9 @@ - Added LEGACYBL to allow slackpkg+ to use blacklist syntax from slackware 14.2 +- Added CHECKDISKSPACE to allow to check diskspace before download and install + packages + *New features: - Added manpages (italian and english) for slackpkgplus.conf @@ -45,6 +48,9 @@ blacklist system from slackware 15.0 may not work properly with third party repositories +- Added check diskspace before download and install packages + + *Improvements - Improved checkrepos.sh diff --git a/src/README b/src/README index f111059..47e260d 100644 --- a/src/README +++ b/src/README @@ -381,6 +381,21 @@ DOWNLOADCMD="aria2c --all-proxy=someproxy:8080 -x 16 -s 16 --auto-file-renaming= ----- +CHECKDISKSPACE Option + +When you set this option to 'on' slackpkg will check for free space on disk +to download and install (not for upgrade) packages. +Note: + to download it will check $TEMP path (/var/cache/packages by default) + to install (and only install, not for upgrade) it will check $ROOT/usr + filesystem since MOST (not ALL) files are there. + +If there is not space available it will prompt for a confirmation to continue +If there is space available it just report the required space. +Default is 'off' + +----- + CACHEUPDATE Option By default 'slackpkg update' download all metadata files (CHECKSUMS.md5, PACKAGES.TXT, diff --git a/src/slackpkgplus.conf.5 b/src/slackpkgplus.conf.5 index d6f764d..3b67b42 100644 --- a/src/slackpkgplus.conf.5 +++ b/src/slackpkgplus.conf.5 @@ -57,10 +57,11 @@ Here is the list of available settings: .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 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 +.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 .in +2 \*1 .br @@ -79,6 +80,8 @@ Here is the list of available settings: \*8 .br \*9 +.br +\*10 .in @@ -278,6 +281,11 @@ DOWNLOADCMD="curl -v -o" For details see the documentation. +.TP 5 +\fBCHECKDISKSPACE\fP +.br +Allow \%slackpkg+ to check needed diskspace to download packages. Also it check needed space to install it in install/install\-new process. + .TP 5 \fBDOWNLOADONLY\fP .br diff --git a/src/slackpkgplus.conf.5.it b/src/slackpkgplus.conf.5.it index f0f3371..b17a205 100644 --- a/src/slackpkgplus.conf.5.it +++ b/src/slackpkgplus.conf.5.it @@ -57,10 +57,11 @@ Seguono le differenti impostazioni disponibili: .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 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 +.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 .in +2 \*1 .br @@ -80,6 +81,8 @@ Seguono le differenti impostazioni disponibili: .br \*9 .in +\*10 +.in \fBImpostazioni di ricerca\fP @@ -276,6 +279,11 @@ DOWNLOADCMD="curl -v -o" Per i dettagli vedere la documentazione. +.TP 5 +\fBCHECKDISKSPACE\fP +.br +Permette a \%slackpkg+ di controllare lo spazio libero su disco per scaricare i pacchetti. Inoltre controlla se c'è spazio sufficiente anche per l'installazione, esclusivamente per i comandi install/install\-new. + .TP 5 \fBDOWNLOADONLY\fP .br diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index c913ced..128a0c2 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -44,6 +44,9 @@ WGETOPTS="--timeout=20 --tries=2" # at /usr/doc/slackpkg+-*/README #DOWNLOADCMD="wget -O" +# Enable (on) / Disable (off) checking disk space to download and install packages. Default to "off" +#CHECKDISKSPACE=on + # Defines if the changelog of any 3rd party repository must be searched in parent URL when not found in base URL. # Can be set to "on" or "off" (default) SEARCH_CLOG_INPARENT=on diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index c39b65f..bacf761 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -52,6 +52,9 @@ WGETOPTS="--timeout=20 --tries=2" # at /usr/doc/slackpkg+-*/README #DOWNLOADCMD="wget -O" +# Enable (on) / Disable (off) checking disk space to download and install packages. Default to "off" +#CHECKDISKSPACE=on + # Defines if the changelog of any 3rd party repository must be searched in parent URL when not found in base URL. # Can be set to "on" or "off" (default) SEARCH_CLOG_INPARENT=on