diff --git a/src/CHANGES b/src/CHANGES index ee2303a..98ced2e 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -25,21 +25,22 @@ - Added LEGACYBL to allow slackpkg+ to use blacklist syntax from slackware 14.2 -- Added CHECKDISKSPACE to allow to check diskspace before download and install +- Added CHECKDISKSPACE to allow to check disk space before download and install packages *New features: - Added manpages (italian and english) for slackpkgplus.conf - to read the italian manpage be sure to export LANG=it_IT.UTF8 + to read the italian manpage be sure to export LANG=it_IT@euro and use the + ISO8859-15 charset in console. - Added a 'fatal log' to show some serious error that the users should not ignore. For example a failure installing packages. - Added SBo support. This does not replace sbopkg. It just search in - SlackBuilds.org and report the presence of the package; he can download - if via 'slackpkg download ', then build and install - packages himself. + SlackBuilds.org and report the presence of the package; you can download + it via 'slackpkg download ', then build and install + packages yourself. - Added httpdir/httpsdir/ftpdir repositories. These repositories does not need metadatas (CHECKSUMS.md5 ...), simple a remote directory listing @@ -48,7 +49,7 @@ blacklist system from slackware 15.0 may not work properly with third party repositories -- Added check diskspace before download and install packages +- Added check disk space before download and install packages - Added new exit codes according to slackpkg-15.0.8 and one specific for slackpkg+ 0 Successful Slackpkg execution. @@ -58,6 +59,8 @@ or removed. 50 Slackpkg itself was upgraded and you need to re-run it. 100 There are pending updates. + IMPORTANT note: please do not use + # slackpkg install-new && slackpkg upgrade-all *Improvements @@ -70,7 +73,7 @@ - Better output for download/install process -- 'slackpkg search' show more info on column Status +- 'slackpkg search' show more compact info on column Status - set PLUGIN_ZCHANGELOG=enable to enable zchangelog.sh plugin set PLUGIN_ZCHANGELOG_SHOW=on to print changelog on stdout @@ -109,8 +112,9 @@ after run slackpkg you can read the exit status with echo $? 1 => WARNING! One or more errors occurred while slackpkg was running 2 => FATAL! Some operation has failed and need attention + other from slackpkg (see above) -- Bash completation removed (already included in slackpkg) +- Bash completion removed (already included in slackpkg) - Works with slackpkg-15 Unfortunately it does not work if $ROOT is non-empty diff --git a/src/slackpkgplus.x86.sample b/src/slackpkgplus.x86.sample index 746a042..809781f 100644 --- a/src/slackpkgplus.x86.sample +++ b/src/slackpkgplus.x86.sample @@ -13,7 +13,7 @@ VERBOSE=1 # Enable TERSE to use a smaller output in installpkg/upgradepkg USETERSE=on -# Enable a smaller output for slackpkg search. It replace first column with a colorized +# Enable a smaller output for slackpkg search. It replace first column with one colorized # on: [unin] uninstalled, [inst] installed, [upgr] upgrade, [mask] uninstalled/masked # tiny: [-] uninstalled, [I] installed, [I] upgrade, [M] uninstalled/masked # off: leave unchanged and black/white. @@ -30,13 +30,13 @@ TERSESEARCH=on USEBL=on # Enable (on) / Disable (off) the legacy blacklist system ignoring the improvement -# from slackpkg 15. Some improvement are not useful with thirdy party repositories +# from slackpkg 15. Some improvement are not useful with third party repositories # Note that the legacy system does apply it as regex to the entire pkglist row # repository, name, version, arch, build, fullname, series/path, extension. LEGACYBL=off # Add custom option to 'wget'. -# You can solve the repository indisponibility issue by set a timeout here +# You can solve the repository unavailability problems by set a timeout here # Also add "-q" for super terse output (useful with USETERSE=on) WGETOPTS="--timeout=20 --tries=2" @@ -47,7 +47,7 @@ WGETOPTS="--timeout=20 --tries=2" # 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. +# Defines if the changelog of any third 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 @@ -55,8 +55,9 @@ SEARCH_CLOG_INPARENT=on # process by downloading just new files (see README). Disabled by default (off) CACHEUPDATE=off -# You can download-only by setting DOWNLOADONLY to 'on'. You may (you should) also use it in commandline +# You can download-only by setting DOWNLOADONLY to 'on'. You may (you should) also use it in command line, # for example: "DOWNLOADONLY=on slackpkg upgrade-all". Useful for large upgrades. +# You may also use 'slackpkg download' if you want to download few packages #DOWNLOADONLY=off # Enable (on) / Disable (off) notification events (see notifymsg.conf) @@ -68,14 +69,14 @@ 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 Whole Word (on) of accept partial words (off). Note that +# Defines if command 'file-search' does search Whole Word (on) or accept partial words (off). Note that # you may obtains many many results searching a short partial word WW_FILE_SEARCH=off -# Select the show order in dialogbox. Available "package" "repository" "tag" "path" "arch" +# Select the show order in dialog box. Available "package" "repository" "tag" "path" "arch" SHOWORDER=package -# Allow to show more details of the package in slackpkg info . Accept "none", "basic", "filelist" +# Allow to show more details of the package in 'slackpkg info '. Accepts "none", "basic", "filelist" DETAILED_INFO=basic # Enable (on) / Disable (off) a Strict GPG Check. A repository should contains packages signed @@ -94,12 +95,12 @@ STRICTGPG=on # OR #PKGS_PRIORITY=( myrepo ) # -# if you have two reporitories to give priority you must set both in the same line +# if you have two repositories to give priority you must set both in the same line #PKGS_PRIORITY=( myrepo restricted:vlc ) # # Otherwise you can try to upgrade a package from a repository that contains a package with the -# same tag of the already installed package. Tipically that means to upgrade a package from the +# same tag of the already installed package. Typically that means to upgrade a package from the # same author of the already installed package. # Note that this method may not works properly where two repositories contains a package with the # same tag. @@ -107,13 +108,13 @@ STRICTGPG=on TAG_PRIORITY=off # List repositories you want to use (defined below) -# remember to launch 'slackpkg update' if you modify that row. +# remember to launch 'slackpkg update' if you modify this row. #REPOPLUS=( slackpkgplus restricted alienbob slacky ) REPOPLUS=( slackpkgplus ) # Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS) -# GPG Note: after adding/renaming a repository, you must to run 'slackpkg update gpg' +# GPG Note: after adding/renaming a repository, you must to run 'slackpkg update gpg'; # some repositories as salixos, have a partial GPG support; # for that repositories you may need to run slackpkg with 'slackpkg -checkgpg=off ...' @@ -138,7 +139,7 @@ MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ # SBo SlackBuilds. Uncomment it to allow slackpkg to search SlackBuilds on SlackBuilds.org -# This does not repleace sbopkg; slackpkg just report the package, version and url; you may +# This does not replace sbopkg; slackpkg just report the package, version and url; you may # download it via 'slackpkg download ' and build it yourself or via sbopkg. #SBO['14.2']=https://www.slackbuilds.org/slackbuilds/14.2/ #SBO['current']=https://cgit.ponce.cc/slackbuilds/ @@ -147,7 +148,7 @@ MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ # Plugin section: # Here you can enable some optional feature. Please read documentation before enable it. # -# ZLookKernel can help you to rebuild initrd and reistall lilo/elilo. This feature was +# ZLookKernel can help you to rebuild initrd and reinstall lilo/elilo. This feature was # removed in slackpkg-15.0. 'enable' this setting to enable it. # read /usr/libexec/slackpkg/functions.d/zlookkernel.sh for more information # It will ask confirmations at every step, unless you will set 'PLUGIN_ZLOOKKERNEL_PROMPT=off' diff --git a/src/slackpkgplus.x86_64.sample b/src/slackpkgplus.x86_64.sample index 9b7ed2b..e40be84 100644 --- a/src/slackpkgplus.x86_64.sample +++ b/src/slackpkgplus.x86_64.sample @@ -13,7 +13,7 @@ VERBOSE=1 # Enable TERSE to use a smaller output in installpkg/upgradepkg USETERSE=on -# Enable a smaller output for slackpkg search. It replace first column with a colorized +# Enable a smaller output for slackpkg search. It replace first column with one colorized # on: [unin] uninstalled, [inst] installed, [upgr] upgrade, [mask] uninstalled/masked # tiny: [-] uninstalled, [I] installed, [I] upgrade, [M] uninstalled/masked # off: leave unchanged and black/white. @@ -28,7 +28,7 @@ TERSESEARCH=on # # Set this flag to 'on' allow slackpkg+ to install 32bit packages on a 64bit slackware # installation (possibly unsafe). Please, do not install both 32 and 64bit of the same -# package to avoid problems, and NEVER upgrade existant 64bit packages with relative 32bit package. +# package to avoid problems, and NEVER upgrade existing 64bit packages with relative 32bit package. # Do not forget to install the multilibs. ALLOW32BIT=off @@ -38,13 +38,13 @@ ALLOW32BIT=off USEBL=on # Enable (on) / Disable (off) the legacy blacklist system ignoring the improvement -# from slackpkg 15. Some improvement are not useful with thirdy party repositories +# from slackpkg 15. Some improvement are not useful with third party repositories # Note that the legacy system does apply it as regex to the entire pkglist row # repository, name, version, arch, build, fullname, series/path, extension. LEGACYBL=off # Add custom option to 'wget'. -# You can solve the repository indisponibility issue by set a timeout here +# You can solve the repository unavailability problems by set a timeout here # Also add "-q" for super terse output (useful with USETERSE=on) WGETOPTS="--timeout=20 --tries=2" @@ -55,7 +55,7 @@ WGETOPTS="--timeout=20 --tries=2" # 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. +# Defines if the changelog of any third 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 @@ -63,8 +63,9 @@ SEARCH_CLOG_INPARENT=on # process by downloading just new files (see README). Disabled by default (off) CACHEUPDATE=off -# You can download-only by setting DOWNLOADONLY to 'on'. You may (you should) also use it in commandline +# You can download-only by setting DOWNLOADONLY to 'on'. You may (you should) also use it in command line, # for example: "DOWNLOADONLY=on slackpkg upgrade-all". Useful for large upgrades. +# You may also use 'slackpkg download' if you want to download few packages #DOWNLOADONLY=off # Enable (on) / Disable (off) notification events (see notifymsg.conf) @@ -76,14 +77,14 @@ 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 Whole Word (on) of accept partial words (off). Note that +# Defines if command 'file-search' does search Whole Word (on) or accept partial words (off). Note that # you may obtains many many results searching a short partial word WW_FILE_SEARCH=off -# Select the show order in dialogbox. Available "package" "repository" "tag" "path" "arch" +# Select the show order in dialog box. Available "package" "repository" "tag" "path" "arch" SHOWORDER=package -# Allow to show more details of the package in slackpkg info . Accept "none", "basic", "filelist" +# Allow to show more details of the package in 'slackpkg info '. Accepts "none", "basic", "filelist" DETAILED_INFO=basic # Enable (on) / Disable (off) a Strict GPG Check. A repository should contains packages signed @@ -102,17 +103,17 @@ STRICTGPG=on # OR #PKGS_PRIORITY=( myrepo ) # -# if you have two reporitories to give priority you must set both in the same line +# if you have two repositories to give priority you must set both in the same line #PKGS_PRIORITY=( myrepo restricted:vlc ) # # -# If you want a multilib system, uncomment the multilib repository and set: +# If you want a multilib system, uncomment the 'multilib' repository and set: #PKGS_PRIORITY=( multilib ) # # (Use /usr/doc/slackpkg+-*/setupmultilib.sh to setup a multilib configuration) # Otherwise you can try to upgrade a package from a repository that contains a package with the -# same tag of the already installed package. Tipically that means to upgrade a package from the +# same tag of the already installed package. Typically that means to upgrade a package from the # same author of the already installed package. # Note that this method may not works properly where two repositories contains a package with the # same tag. @@ -120,13 +121,13 @@ STRICTGPG=on TAG_PRIORITY=off # List repositories you want to use (defined below) -# remember to launch 'slackpkg update' if you modify that row. +# remember to launch 'slackpkg update' if you modify this row. #REPOPLUS=( slackpkgplus restricted alienbob slacky ) REPOPLUS=( slackpkgplus ) # Define mirrors (uncomment one or more mirror; remember to add it to REPOPLUS) -# GPG Note: after adding/renaming a repository, you must to run 'slackpkg update gpg' +# GPG Note: after adding/renaming a repository, you must to run 'slackpkg update gpg'; # some repositories as salixos, have a partial GPG support; # for that repositories you may need to run slackpkg with 'slackpkg -checkgpg=off ...' @@ -153,7 +154,7 @@ MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ # SBo SlackBuilds. Uncomment it to allow slackpkg to search SlackBuilds on SlackBuilds.org -# This does not repleace sbopkg; slackpkg just report the package, version and url; you may +# This does not replace sbopkg; slackpkg just report the package, version and url; you may # download it via 'slackpkg download ' and build it yourself or via sbopkg. #SBO['14.2']=https://www.slackbuilds.org/slackbuilds/14.2/ #SBO['current']=https://cgit.ponce.cc/slackbuilds/ @@ -162,7 +163,7 @@ MIRRORPLUS['slackpkgplus']=https://slakfinder.org/slackpkg+15/ # Plugin section: # Here you can enable some optional feature. Please read documentation before enable it. # -# ZLookKernel can help you to rebuild initrd and reistall lilo/elilo. This feature was +# ZLookKernel can help you to rebuild initrd and reinstall lilo/elilo. This feature was # removed in slackpkg-15.0. 'enable' this setting to enable it. # read /usr/libexec/slackpkg/functions.d/zlookkernel.sh for more information # It will ask confirmations at every step, unless you will set 'PLUGIN_ZLOOKKERNEL_PROMPT=off'