diff options
Diffstat (limited to 'source/ap/slackpkg/files/slackpkg')
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg index 67864930c..49a123764 100644 --- a/source/ap/slackpkg/files/slackpkg +++ b/source/ap/slackpkg/files/slackpkg @@ -178,6 +178,14 @@ while [ -n "$1" ] ; do ONLY_NEW_DOTNEW=off shift ;; + -orig_backups=on) + ORIG_BACKUPS=on + shift + ;; + -orig_backups=off) + ORIG_BACKUPS=off + shift + ;; -use_includes=on) USE_INCLUDES=on shift @@ -206,7 +214,7 @@ while [ -n "$1" ] ; do SOURCE=$(echo $1 | cut -f2 -d=) shift ;; - install|reinstall|upgrade|remove|blacklist|download) + install|reinstall|upgrade|remove|download) CMD=$1 shift if [ -n "$1" ]; then @@ -238,7 +246,7 @@ while [ -n "$1" ] ; do shift fi ;; - install-new|upgrade-all|clean-system|new-config|check-updates|help) + install-new|upgrade-all|clean-system|new-config|check-updates|show-changelog|help) CMD=$1 shift if [ -n "$1" ]; then @@ -310,11 +318,22 @@ case "$CMD" in full_usage ;; check-updates) + # output to stdout if no change, or stderr if changes. Will cause + # cron jobs to notify system admin if checkchangelog 1>/dev/null 2>/dev/null ; then - echo "No updated packages since last check." + echo "Slackpkg: No updated packages since last check." + else + echo "Slackpkg: Updated packages are available since last check." >&2 + fi + ;; + show-changelog) + # display changelog and exit + if [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then + $MORECMD ${ROOT}/${WORKDIR}/ChangeLog.txt else - echo "Updated packages are available since last check." + echo "ChangeLog.txt file not found. Aborting" fi + POSTINST=off ;; update) # If you are using "slackpkg update gpg" OR the system @@ -431,7 +450,7 @@ case "$CMD" in cleanup exit 0 fi - for i in pkgtools glibc-solibs aaa_elflibs readline sed; do + for i in pkgtools aaa_glibc-solibs glibc-solibs aaa_libraries aaa_elflibs readline sed; do FOUND="" FOUND=$(echo $SHOWLIST | tr -s ' ' "\n" | grep "${i}-[0-9]") if [ "$FOUND" != "" ]; then @@ -461,20 +480,8 @@ case "$CMD" in grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD cleanup fi - - makelist ${INPUTLIST} - for i in $LIST; do - BASENAME=$(cutpkg $i) - BLACKLIST="$BLACKLIST $BASENAME" - done - BLACKLIST=$(echo $BLACKLIST | tr ' ' "\n") - if [ "$BLACKLIST" = "" ]; then - echo -e "No packages match the pattern." - cleanup - else - showlist "$BLACKLIST" $CMD - fi - + + # As of 15.0, this function just runs /bin/false and exits with a comment blacklist_pkg ;; file-search) @@ -586,11 +593,11 @@ esac # # Executes the post-install. This is the default # Before runs post-install, check if the slackpkg option is -# remove, search, update, blacklist, info or clean-system. +# remove, search, update, info or clean-system. # 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 blacklist info \ +for i in check-updates remove search file-search update info \ clean-system download generate-template remove-template; do if [ "$CMD" = "$i" ]; then POSTINST=off |