slackpkg 2.84.0_beta1 - Testing Wanted

Hi.
Adding progress percentage in slackpkg is simpler than slackpkg+ and more complete

This is for Release 2.84.0_beta6 (commit d3632208a5b190f1c68aac3c6a36b9a7bdf6dffc)

1) add function progress that print the percentage
2) in every install-new, upgrade-all etc you have to calculate packages before than start analyze them, then count, then use them
3) a slower operation is preparing the dialog box, so you can add a progress here
4) during install/upgrade you can print the progress


slackpkg-2.84-6-progress.diff.txt

--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -545,6 +545,15 @@ function checkgpg() {
        gpg --verify ${1}.asc ${1} 2>/dev/null && echo "1" || echo "0"
 }
 
+function progress {
+    if [ ! -z "$TOPROCESS" ];then
+      let INPROGRESS++
+      printf "%3s%%\b\b\b\b" "$[$INPROGRESS*100/$TOPROCESS]"
+    else
+      let INPROGRESS++
+      printf "%4s\b\b\b\b" "$INPROGRESS"
+    fi
+}
 # Found packages in repository. 
 # This function selects the package from the higher priority
 # repository directories.
@@ -554,6 +563,7 @@ function givepriority {
         local ARGUMENT=$1
        local PKGDATA
 
+
        unset NAME
         unset FULLNAME
        unset PKGDATA
@@ -633,24 +643,41 @@ function makelist() {
 
        case "$CMD" in
                download)
+                        PKGLIST=""
                        for ARGUMENT in $(echo $INPUTLIST); do
-                               for i in $(grep -w -- "${ARGUMENT}" ${TMPDIR}/pkglist | cut -f2 -d\  | sort -u); do
+                               PKGLIST="$PKGLIST$(echo -e "\n";grep -w -- "${ARGUMENT}" ${TMPDIR}/pkglist | cut -f2 -d\  | sort -u)"
+                        done
+                        PKGLIST="$(echo "$PKGLIST"|sort -u|grep -v ^$)"
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
+                               for i in $PKGLIST; do
+                                        progress
                                        LIST="$LIST $(grep " ${i} " ${TMPDIR}/pkglist | cut -f6,8 -d\  --output-delimiter=.)"
                                done
                                LIST="$(echo -e $LIST | sort -u)"
-                       done
                ;;
                blacklist)
+                        PKGLIST=""
                        for ARGUMENT in $(echo $INPUTLIST); do
-                               for i in $(cat ${TMPDIR}/pkglist ${TMPDIR}/tmplist | \
-                                               grep -w -- "${ARGUMENT}" | cut -f2 -d\  | sort -u); do
+                               PKGLIST="$PKGLIST$(echo -e "\n";cat ${TMPDIR}/pkglist ${TMPDIR}/tmplist | \
+                                               grep -w -- "${ARGUMENT}" | cut -f2 -d\  | sort -u)"
+                        done
+                        PKGLIST="$(echo "$PKGLIST"|sort -u|grep -v ^$)"
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
+                               for i in $PKGLIST;do
+                                        progress
                                        grep -qx "${i}" ${CONF}/blacklist || LIST="$LIST $i"
                                done
-                       done
                ;;
                install|upgrade|reinstall)
+                        PKGLIST=""
                        for ARGUMENT in $(echo $INPUTLIST); do
-                               for i in $(grep -w -- "${ARGUMENT}" ${TMPDIR}/pkglist | cut -f2 -d\  | sort -u); do
+                               PKGLIST="$PKGLIST$(echo -e "\n";grep -w -- "${ARGUMENT}" ${TMPDIR}/pkglist | cut -f2 -d\  | sort -u)"
+                        done
+                        PKGLIST="$(echo "$PKGLIST"|sort -u|grep -v ^$)"
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
+
+                               for i in $PKGLIST; do
+                                        progress
                                        givepriority $i
                                        [ ! "$FULLNAME" ] && continue
 
@@ -672,22 +699,30 @@ function makelist() {
                                                ;;
                                        esac
                                done
-                       done
                ;;
                remove)
+                        PKGLIST=""
                        for ARGUMENT in $(echo $INPUTLIST); do
-                               for i in $(cat ${TMPDIR}/pkglist ${TMPDIR}/tmplist | \
-                                               grep -w -- "${ARGUMENT}" | cut -f6 -d\  | sort -u); do
+                               PKGLIST="$PKGLIST$(echo -e "\n";cat ${TMPDIR}/pkglist ${TMPDIR}/tmplist | grep -w -- "${ARGUMENT}" | cut -f6 -d\  | sort -u)"
+                        done
+                        PKGLIST="$(echo "$PKGLIST"|sort -u|grep -v ^$)"
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
+
+                               for i in $PKGLIST;do
+                                        progress
                                        PKGDATA=( $(grep -w -- "$i" ${TMPDIR}/tmplist) )
                                        [ ! "$PKGDATA" ] && continue
                                        LIST="$LIST ${PKGDATA[5]}" 
                                        unset PKGDATA
                                done
-                       done
                ;;
                clean-system)
                        listpkgname
-                       for i in $(comm -2 -3 ${TMPDIR}/lpkg ${TMPDIR}/spkg) ; do
+                       PKGLIST=$(comm -2 -3 ${TMPDIR}/lpkg ${TMPDIR}/spkg)
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
+
+                       for i in $PKGLIST;do
+                                progress
                                PKGDATA=( $(grep -- "^local $i " ${TMPDIR}/tmplist) )
                                [ ! "$PKGDATA" ] && continue
                                LIST="$LIST ${PKGDATA[5]}" 
@@ -696,9 +731,13 @@ function makelist() {
                ;;
                upgrade-all)
                        listpkgname
-                       for i in $(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | \
-                                  comm -1 -2 - ${TMPDIR}/spkg) ; do
+                       PKGLIST=$(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | \
+                                  comm -1 -2 - ${TMPDIR}/spkg)
+
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
 
+                       for i in $PKGLIST;do
+                                progress
                                givepriority ${i}
                                [ ! "$FULLNAME" ] && continue
 
@@ -709,11 +748,14 @@ function makelist() {
                        done
                ;;
                install-new)
-                       for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt |\
-                                 sort -u ) dialog aaa_terminfo fontconfig \
-                               ntfs-3g ghostscript wqy-zenhei-font-ttf \
-                               xbacklight xf86-video-geode ; do
+                       PKGLIST=$(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt |\
+                                 sort -u )
+                        PKGLIST="$PKGLIST dialog aaa_terminfo fontconfig ntfs-3g ghostscript wqy-zenhei-font-ttf"
+                       PKGLIST="$PKGLIST xbacklight xf86-video-geode"
+                        TOPROCESS=$(echo $PKGLIST|wc -w)
 
+                       for i in $PKGLIST;do
+                                progress
                                givepriority $i
                                [ ! "$FULLNAME" ] && continue
 
@@ -722,7 +764,9 @@ function makelist() {
                        done
                ;;
                install-template)
+                        TOPROCESS=$(echo $INPUTLIST|wc -w)
                        for i in $INPUTLIST ; do
+                                progress
                                givepriority $i
                                [ ! "$FULLNAME" ] && continue
                                grep -q " ${NAME} " ${TMPDIR}/tmplist || \
@@ -730,7 +774,9 @@ function makelist() {
                        done
                ;;
                remove-template)
+                        TOPROCESS=$(echo $INPUTLIST|wc -w)
                        for i in $INPUTLIST ; do
+                                progress
                                givepriority $i
                                [ ! "$FULLNAME" ] && continue
                                grep -q " ${NAME} " ${TMPDIR}/tmplist && \
@@ -745,30 +791,37 @@ function makelist() {
 
                        if [ "$CMD" = "file-search" ]; then
                                # Search filelist.gz for possible matches
+                                PKGS=""
                                for i in ${PRIORITY[@]}; do
                                        if [ -e ${ROOT}/${WORKDIR}/${i}-filelist.gz ]; then
-                                               PKGS="$(zegrep -w "${INPUTLIST}" ${ROOT}/${WORKDIR}/${i}-filelist.gz | \
+                                               PKGS="$PKGS $(zegrep -w "${INPUTLIST}" ${ROOT}/${WORKDIR}/${i}-filelist.gz | \
                                                        cut -d\  -f 1 | awk -F'/' '{print $NF}')"
+                                        fi
+                                done
+                                                TOPROCESS=$(echo $PKGS|wc -w)
                                                for FULLNAME in $PKGS ; do
+                                                        progress
                                                        NAME=$(cutpkg ${FULLNAME})
                                                        grep -q "^${NAME}$" $PKGNAMELIST && continue
                                                        LIST="$LIST ${FULLNAME}"
                                                        echo "$NAME" >> $PKGNAMELIST
                                                done
-                                       fi
-                               done
                        else
+                                PKGS=""
                                for i in ${PRIORITY[@]}; do
-                                       PKGS=$(grep "^${i}.*${PATTERN}" \
-                                               ${TMPDIR}/pkglist | cut -f6 -d\ )
+                                       PKGS="$PKGS $(grep "^${i}.*${PATTERN}" \
+                                               ${TMPDIR}/pkglist | cut -f6 -d\ )"
+                                done
+                                PKGS="$(echo "$PKGS"|grep -v ^$)"
+                                TOPROCESS=$(echo $PKGS|wc -w)
                                        for FULLNAME in $PKGS ; do
+                                                progress
                                                NAME=$(cutpkg ${FULLNAME})
 
                                                grep -q "^${NAME}$" $PKGNAMELIST && continue
                                                LIST="$LIST ${FULLNAME}"
                                                echo "$NAME" >> $PKGNAMELIST
                                        done
-                               done
                        fi
                        rm -f $PKGNAMELIST
                ;;
@@ -1298,32 +1351,49 @@ function remove_pkg() {
 
 function upgrade_pkg() {
        local i
+        local q
+        local c
+
 
        if [ "$DOWNLOAD_ALL" = "on" ]; then
                OLDDEL="$DELALL"
                DELALL="off"
+                c=1
                for i in $SHOWLIST; do
+                        echo -n "[$c/$q]"
+                        let c++
                        getpkg $i true
                done
                DELALL="$OLDDEL"
        fi
+        c=1
        for i in $SHOWLIST; do
+                echo -n "[$c/$q]"
+                let c++
                getpkg $i upgradepkg Upgrading
        done
 }
 
 function install_pkg() {
        local i
+        local q
+        local c
 
        if [ "$DOWNLOAD_ALL" = "on" ]; then
                OLDDEL="$DELALL"
                DELALL="off"
+                c=1
                for i in $SHOWLIST; do
+                        echo -n "[$c/$q]"
+                        let c++
                        getpkg $i true
                done
                DELALL="$OLDDEL"
        fi
+        c=1
        for i in $SHOWLIST; do
+                echo -n "[$c/$q]"
+                let c++
                getpkg $i installpkg Installing
        done
 }
diff --git a/files/dialog-functions.sh b/files/dialog-functions.sh
old mode 100644
new mode 100755
index a583a35..5ee3da4
--- a/files/dialog-functions.sh
+++ b/files/dialog-functions.sh
@@ -18,10 +18,15 @@ if [ "$DIALOG" = "on" ] || [ "$DIALOG" = "ON" ]; then
                        ONOFF=on
                fi
                rm -f $TMPDIR/dialog.tmp
+                q=$(echo $1|wc -w)
+                c=1
+                echo -n "Preparing list... "
 
                if [ "$2" = "upgrade" ]; then
                        ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist
                        for i in $1; do
+                                printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]"
+                                let c++
                                BASENAME=$(cutpkg $i)
                                PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-\(noarch\|fw\|${ARCH}\)" $TMPDIR/tmplist)
                                echo "$i \"\" $ONOFF \"currently installed: $PKGFOUND\"" >>$TMPDIR/dialog.tmp
@@ -29,6 +34,8 @@ if [ "$DIALOG" = "on" ] || [ "$DIALOG" = "ON" ]; then
                        HINT="--item-help"
                else
                        for i in $1; do
+                                printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]"
+                                let c++
                                echo "$i \"\" $ONOFF" >>$TMPDIR/dialog.tmp
                        done
                        HINT=""

Hope this help

Suggests:
on /etc/slackpkg/mirrors leave https://mirrors.slackware.com/slackw...are64-current/ uncommented by default since it is the official mirror and autoswitching to localized mirror, so slackpkg is ready to use.

If you want to speedup slackpkg try that patch
slackpkg upgrade-all is 3 time faster for me .

--- a/files/core-functions.sh
+++ b/files/core-functions.sh
@@ -558,14 +558,11 @@ function givepriority {
         unset FULLNAME
        unset PKGDATA
        
-        for DIR in ${PRIORITY[@]} ; do
-               [ "$PKGDATA" ] && break
-                PKGDATA=( $(grep "^${DIR} ${ARGUMENT} " ${TMPDIR}/pkglist) )
-                if [ "$PKGDATA" ]; then
-                       NAME=${PKGDATA[1]}
-                        FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}")
-                fi
-        done
+        PKGDATA=( $(echo "$REPOGREP"|grep -f - -m1 ${TMPDIR}/pkglist) )
+        if [ "$PKGDATA" ]; then
+                NAME=${PKGDATA[1]}
+                FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}")
+        fi
 }
 
 # Creates files with mirror package names (spkg), local package
@@ -631,6 +628,14 @@ function makelist() {
 
        [ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
 
+        TEMPSEP=""
+        REPOGREP=""
+        for DIR in ${PRIORITY[@]} ; do
+                REPOGREP="$REPOGREP$TEMPSEP^${DIR} ${ARGUMENT} "
+                TEMPSEP=$'\n'
+        done
+
+
        case "$CMD" in
                download)
                        for ARGUMENT in $(echo $INPUTLIST); do

slackpkg-2.84-6-speedup.diff.txt

Hello.
It's time that I fix slackpkg+ for using $ROOT since starting slackpkg 2.82.3 changed how it works applying it to $WORKDIR, $TEMP, and $TMPDIR instances.

But this commit confuse me:

commit a9c7e7d4c7d40b36965bcf8a45419c2de6d04954
Author: Robby Workman <rworkman@slackware.com>
Date:   Mon Jan 14 23:17:13 2019 -0600

    Fixup blacklist checking and appending when using alt $ROOT
    
    Thanks to dive for the report.

From code, slackpkg does not apply $ROOT to $CONF/slackpkg.conf and $CONF/mirrors, but partially apply it to $CONF/blacklist

core-functions.sh:595:  grep -vE "(^#|^[[:blank:]]*$)" ${ROOT}/${CONF}/blacklist | \
core-functions.sh:647:                                  grep -qx "${i}" ${CONF}/blacklist || LIST="$LIST $i"
core-functions.sh:1235:                 grep -qx "${i}" ${CONF}/blacklist && continue
core-functions.sh:1283: echo $SHOWLIST | tr ' ' "\n" >> ${ROOT}/${CONF}/blacklist
core-functions.sh:1286:If you want to remove those packages, edit ${CONF}/blacklist.\n"

slackpkg:469:                   grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD

it's correct that:
1) $CONF does not honor $ROOT ?
2) $CONF/blacklist does honor $ROOT ?

Originally Posted by zerouno If you want to speedup slackpkg try that patch slackpkg upgrade-all is 3 time faster for me . --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -558,14 +558,11 @@ function givepriority { unset FULLNAME unset PKGDATA - for DIR in ${PRIORITY[@]} ; do - [ "$PKGDATA" ] && break - PKGDATA=( $(grep "^${DIR} ${ARGUMENT} " ${TMPDIR}/pkglist) ) - if [ "$PKGDATA" ]; then - NAME=${PKGDATA[1]} - FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}") - fi - done + PKGDATA=( $(echo "$REPOGREP"|grep -f - -m1 ${TMPDIR}/pkglist) ) + if [ "$PKGDATA" ]; then + NAME=${PKGDATA[1]} + FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}") + fi } # Creates files with mirror package names (spkg), local package @@ -631,6 +628,14 @@ function makelist() { [ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting & + TEMPSEP="" + REPOGREP="" + for DIR in ${PRIORITY[@]} ; do + REPOGREP="$REPOGREP$TEMPSEP^${DIR} ${ARGUMENT} " + TEMPSEP=$'\n' + done + + case "$CMD" in download) for ARGUMENT in $(echo $INPUTLIST); do Attachment 32586

Well, sure, but um, REPOGREP isn't populated anywhere in stock slackpkg :-)

Originally Posted by zerouno Hello. From code, slackpkg does not apply $ROOT to $CONF/slackpkg.conf and $CONF/mirrors, but partially apply it to $CONF/blacklist core-functions.sh:595: grep -vE "(^#|^[[:blank:]]*$)" ${ROOT}/${CONF}/blacklist | \ core-functions.sh:647: grep -qx "${i}" ${CONF}/blacklist || LIST="$LIST $i" core-functions.sh:1235: grep -qx "${i}" ${CONF}/blacklist && continue core-functions.sh:1283: echo $SHOWLIST | tr ' ' "\n" >> ${ROOT}/${CONF}/blacklist core-functions.sh:1286:If you want to remove those packages, edit ${CONF}/blacklist.\n" slackpkg:469: grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD it's correct that: 1) $CONF does not honor $ROOT ? 2) $CONF/blacklist does honor $ROOT ?

This is admittedly confusing, and frankly, I'm not sure I understand why we did it that way. I can at least rationalize some of it though...

Assuming we are installing to an alternate $ROOT, we want to check the altroot's blacklist (hence line 595).

It looks like 647 and 1235 were overlooked, so I'm going to fix those up.

Line 1283 is adding things to blacklist and thus it is reasonable to add them to the altroot's blacklist if $ROOT is defined.

I'll also fix up line 469 in the slackpkg script itself.

This ROOT support is fragile. :/ I wouldn't have undertaken it had it been my call, but it was already (partially) supported (but broken) for some use cases, so fixes were committed, which led to more fixes, and so on until here we are... I just hope nothing breaks as result of the changes I'm about to commit... :/

An use case for $Root is lxc

/usr/share/lxc/templates/lxc-slackware

It have to been fixed since slackware current breaks it but this may be a starting point.

Originally Posted by rworkman This is admittedly confusing, and frankly, I'm not sure I understand why we did it that way. I can at least rationalize some of it though... Assuming we are installing to an alternate $ROOT, we want to check the altroot's blacklist (hence line 595). It looks like 647 and 1235 were overlooked, so I'm going to fix those up. Line 1283 is adding things to blacklist and thus it is reasonable to add them to the altroot's blacklist if $ROOT is defined. I'll also fix up line 469 in the slackpkg script itself. This ROOT support is fragile. :/ I wouldn't have undertaken it had it been my call, but it was already (partially) supported (but broken) for some use cases, so fixes were committed, which led to more fixes, and so on until here we are... I just hope nothing breaks as result of the changes I'm about to commit... :/

it seems, unfortunately, that the new modifications introduced between beta6 and beta7 actually break the lxc template (beta6 was working fine): I was testing a new version of the template (that I revised mostly last summer) with a newer version of lxc that should work fine on current

http://ponce.cc/slackware/testing/new_lxc/

seems that *forcing* $CONF under $ROOT is what break things here: $CONF in the template is used to have a temporary location, outside of the container, in which to store the template, a blacklist and a mirror configuration for the container creation.
IMHO is not essential to enforce $CONF under $ROOT as it can specified manually at the same location (CONF=/chroot/etc/slackpkg) as needed with losing no functionality.

Originally Posted by ponce it seems, unfortunately, that the new modifications introduced between beta6 and beta7 actually break the lxc template (beta6 was working fine): I was testing a new version of the template (that I revised mostly last summer) with a newer version of lxc that should work fine on current http://ponce.cc/slackware/testing/new_lxc/ seems that *forcing* $CONF under $ROOT is what break things here: $CONF in the template is used to have a temporary location, outside of the container, in which to store the template, a blacklist and a mirror configuration for the container creation. IMHO is not essential to enforce $CONF under $ROOT as it can specified manually at the same location (CONF=/chroot/etc/slackpkg) as needed with losing no functionality.

It's reverted. I don't like the inconsistency with ROOT definitions but I'm not going to break our upstream either :-)
Unless something major comes along and/or some very trivial things occur, consider 2.84.0_beta8 to be what will hopefully become 2.84.0.

Originally Posted by rworkman slackpkg 2.84.0_beta1 - Testing Wanted

Testing "slackpkg - version 2.84.0_beta8" and it seems to be working great, thus far. Thanks for the new software and the opportunity to test it.

Only thing I've noticed is literary. In the man page, it appears that the 'onoff' function is no longer featured, yet still works like a boss:

~# slackpkg -onoff=off upgrade-all
~# slackpkg -onoff=off install-new

I use the '-onoff=off' parameter a lot. It's very useful for my 'slackpkg' requirements.

[EDIT] ^^^ This is on Slackware ARM -current btw.

Odd, I'm using "slackpkg - version 2.84.0_beta6" when we go to beta8?

'slackpkg -onoff=off upgrade-all' works here. Tested with slackpkg+ and without slackpkg+

Perhaps it be a Slackware ARM issue.

Originally Posted by chrisretusn Odd, I'm using "slackpkg - version 2.84.0_beta6" when we go to beta8?

There is a hint on beta8 in post #39 by Robby...

Originally Posted by rworkman ...Unless something major comes along and/or some very trivial things occur, consider 2.84.0_beta8 to be what will hopefully become 2.84.0.

I note that 2.84.0-beta8 does not include this suggestion.

Originally Posted by Chuck56 There is a hint on beta8 in post #39 by Robby...

Ah ha!

Just upgraded to beta8 still working here.

Originally Posted by allend I note that 2.84.0-beta8 does not include this suggestion.

I did something similar, except I did not use install-new

PRIORITY=( patches testing %PKGMAIN extra pasture )

# slackpkg install testing
# slackpkg upgrade testing