diff options
Diffstat (limited to '')
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg | 37 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg.8 | 13 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg.conf.5 | 2 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg.conf.new | 2 |
4 files changed, 24 insertions, 30 deletions
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg index 49a123764..2553191dc 100644 --- a/source/ap/slackpkg/files/slackpkg +++ b/source/ap/slackpkg/files/slackpkg @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # @@ -52,7 +52,10 @@ fi VERSION=@VERSION@ PATH=/bin:/usr/bin:/sbin:/usr/sbin SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ ) -CONF=${CONF:-/etc/slackpkg} + +[ -z "$ROOT" ] && CONF=${CONF:-/etc/slackpkg} +[ -n "$ROOT" ] && CONF=${CONF:-"${ROOT}/etc/slackpkg"} + SOURCE=$(sed -n ' # Remove leading and trailing blanks s/^[[:blank:]]*// @@ -68,6 +71,7 @@ SOURCE=$(sed -n ' \@^https\{0,1\}://@p \@^ftps\{0,1\}://@p' $CONF/mirrors) . $CONF/slackpkg.conf +WORKDIR=${ROOT}/${WORKDIR} ERROR="" # Set temporary directory @@ -238,6 +242,10 @@ while [ -n "$1" ] ; do fi shift $# ;; + blacklist) + CMD=$1 + shift $# + ;; update) CMD=$1 shift @@ -324,12 +332,13 @@ case "$CMD" in echo "Slackpkg: No updated packages since last check." else echo "Slackpkg: Updated packages are available since last check." >&2 + PENDING_UPDATES=1 fi ;; show-changelog) # display changelog and exit - if [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then - $MORECMD ${ROOT}/${WORKDIR}/ChangeLog.txt + if [ -e ${WORKDIR}/ChangeLog.txt ]; then + $MORECMD ${WORKDIR}/ChangeLog.txt else echo "ChangeLog.txt file not found. Aborting" fi @@ -472,17 +481,11 @@ case "$CMD" in fi ;; blacklist) - # - # If blacklist is called without package name, list - # all blacklisted packages - if [ "$INPUTLIST" = "" ]; then - echo -e "Packages in blacklist:\n" - grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD - cleanup - fi - - # As of 15.0, this function just runs /bin/false and exits with a comment - blacklist_pkg + echo -e "Edit /etc/slackpkg/blacklist to add or remove packages." + echo -e "" + echo -e "Packages in blacklist:\n" + grep -v "^#" $CONF/blacklist | $MORECMD + echo -e "" ;; file-search) PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g') @@ -523,7 +526,7 @@ case "$CMD" in if ( found != 1 ) { print \"No packages found! Try:\n\n\tslackpkg search $PATTERN\n\nand choose one (and ONLY one package).\n\" } - }" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null + }" ${WORKDIR}/PACKAGES.TXT 2>/dev/null ;; new-config) POSTINST=on @@ -597,7 +600,7 @@ esac # That options don't change configurations files and, if # someone remove the kernel, i hope he knows what is doing. # -for i in check-updates remove search file-search update info \ +for i in check-updates remove search file-search update info blacklist \ clean-system download generate-template remove-template; do if [ "$CMD" = "$i" ]; then POSTINST=off diff --git a/source/ap/slackpkg/files/slackpkg.8 b/source/ap/slackpkg/files/slackpkg.8 index b1baa45d3..ab36202e4 100644 --- a/source/ap/slackpkg/files/slackpkg.8 +++ b/source/ap/slackpkg/files/slackpkg.8 @@ -1,4 +1,4 @@ -.TH SLACKPKG 8 "March 22, 2018" slackpkg-2.82.2 "" +.TH SLACKPKG 8 "March 12, 2021" slackpkg-15.0.1 "" .SH NAME .B slackpkg \- Automated tool for managing Slackware Linux packages @@ -6,7 +6,7 @@ .SH SYNOPSIS .B slackpkg .B [OPTIONS] -.B {install|remove|search|file-search|download|upgrade|reinstall|blacklist} +.B {install|remove|search|file-search|download|upgrade|reinstall} .BI { PATTERN | FILE } .B slackpkg [OPTIONS] {clean-system|upgrade-all|install-new} @@ -226,15 +226,6 @@ With remove, you can remove certain installed packages. As an example: will remove all packages with "kde" in their name. .TP 5 -.B blacklist -.br -With this action, you can "blacklist" certain packages. -.br -Blacklisted packages will not be installed, upgraded, or removed by slackpkg. -If you want to remove some package from the black list, please edit -/etc/slackpkg/blacklist. - -.TP 5 .B download .br This action tells slackpkg to download the packages, but not to install them. diff --git a/source/ap/slackpkg/files/slackpkg.conf.5 b/source/ap/slackpkg/files/slackpkg.conf.5 index 529bfba71..e8ca95d81 100644 --- a/source/ap/slackpkg/files/slackpkg.conf.5 +++ b/source/ap/slackpkg/files/slackpkg.conf.5 @@ -1,4 +1,4 @@ -.TH SLACKPKG.CONF 5 "Oct 2017" slackpkg-2.82.2 "" +.TH SLACKPKG.CONF 5 "March 2021" slackpkg-15.0.1 "" .SH NAME .B slackpkg.conf \- Configuration data for slackpkg diff --git a/source/ap/slackpkg/files/slackpkg.conf.new b/source/ap/slackpkg/files/slackpkg.conf.new index fb6ae1ddc..cbc845da3 100644 --- a/source/ap/slackpkg/files/slackpkg.conf.new +++ b/source/ap/slackpkg/files/slackpkg.conf.new @@ -21,7 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br |