slackpkg+ 1.8

zerouno · 02-14-2020, 06:18 PM

Quote:

Originally Posted by denydias

've copy/paste it

Ok, this is the reason. However I've to thank you since I learned a new thing: $'s/\r//' is better than 's/^M//'

Quote:

Originally Posted by rworkman

I was referring to the replacement of the spinnythingy :-)

I'm sorry (I did read from smartphone)

Quote:

Originally Posted by denydias

Now I have a question about SBOURL. Default one is https://www.slackbuilds.org/slackbuilds/14.2/. Is there a way so it can use ponce's -current SBo fork? It's url is git://github.com/Ponce/slackbuilds.git@current.

Unfortunately seems that Ponce does not add SLACKBUILDS.TXT.gz that is required

Quote:

Originally Posted by chrisretusn

Works as advertised. Neat feature. Suggestion, add a SBOOFF variable to turn on SBOURL. Typing 'SBOOFF=on slackpkg search ffmpeg' it a bit easier to remember than 'SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/ slackpkg search ffmpeg'.

You does not need that. Just put 'SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/' in slackpkgplus.conf then run slackpkg update

Quote:

Originally Posted by chrisretusn

Not really sure what you mean by package group.

ap , a , d , xap ... are package groups.

I hope I haven't forgotten anything.
For ffmpeg and related search-output I have to reread the posts

, but currently is midnight

zerouno · 02-14-2020, 06:28 PM

This is zlookkernel.sh zlookkernel.sh.txt
Put it in /usr/libexec/slackpkg/functions.d (stripped of txt extention) and where the kernel will be updated you will obtain an help to rebuild lilo/elilo/initrd.
It is optional an in test. Not really a part of slackpkg+

allend · 02-14-2020, 08:09 PM

Quote:

This is zlookkernel.sh

I do not like the logic in that. You build the new initrd before checking for the presence of the new kernel modules.

zerouno · 02-15-2020, 05:24 AM

It just check the presence of new kernel. If there is a new kernel then should exist a newer kernel modules.

chrisretusn · 02-15-2020, 08:26 AM

Quote:

Originally Posted by denydias

I understand that the (masked) label refers to packages that are not candidates to be installed as an upgrade because repository priorities forbid them to do so.

In my case, I have "PKGS_PRIORITY=( restricted ktown )" in place, so even though slackware64's ffmpeg is newer (4.2.2) than the one I've currently installed (4.2.1), the prior will not be installed as the later is the one "masking" it.

The word "masked" explains very little of this, as well as the place where it's applied to. Is there a better wording for this? Or maybe:

Code:

[ Status              ] [ Repository  ] [ Package                                                    ]
  installed(masking)      restricted      ffmpeg-4.2.1-x86_64-1alien
...
  uninstalled(masked)     extra           ffmpeg-4.2.2-x86_64-1_alsa
  uninstalled(masked)     ponce           ffmpeg-4.2.2-x86_64-1ponce
  uninstalled(masked)     slackware64     ffmpeg-4.2.2-x86_64-1

Slackpkg is not masking the restricted package for ffmpeg, it is installed and will be upgraded when a new version is made available in the restricted repository. Those other packages are "masked" (or hidden) from being acted upon by slackpkg.

Code:

The list below shows all packages with name matching "fmpeg-4".

[ Status              ] [ Repository  ] [ Package                     ]
  installed               restricted      ffmpeg-4.2.1-x86_64-1alien 
  uninstalled(masked)     extra           ffmpeg-4.2.2-x86_64-1_alsa 
  uninstalled(masked)     slackware64     ffmpeg-4.2.2-x86_64-1      

slackpkgplus.conf:
PKGS_PRIORITY=( nonslack slackpkgplus multilib ktown testing restricted slackware64:id3lib alienbob )
REPOPLUS=( nonslack slackpkgplus multilib ktown restricted alienbob )

I see that the ffmpeg package from restricted is installed will be the package that will be acted upon by slackpkg when a newer version of that packages is available in restricted. That list tells me my settings in slackpkgplus.conf are good for what I want.

I my previous post I was thinking I should see another ffmpeg in the list, the one in the alienbob repository:

Code:

The list below shows all packages with name matching "fmpeg-4".

[ Status              ] [ Repository  ] [ Package                     ]
  uninstalled(masked)     alienbob        ffmpeg-4.2.1-x86_64-1alien 
  installed               restricted      ffmpeg-4.2.1-x86_64-1alien 
  uninstalled(masked)     extra           ffmpeg-4.2.2-x86_64-1_alsa 
  uninstalled(masked)     slackware64     ffmpeg-4.2.2-x86_64-1

zerouno · 02-15-2020, 01:33 PM

Yes, it's a bug
slackpkg search ffmpeg
does show it
slackpkg search ffmpeg-4
no.
I will investigate

chrisretusn · 02-16-2020, 07:02 AM

May I have something configured wrong then, here using 'slackpkg search ffmpeg' results in:

Code:

The list below shows all packages with name matching "ffmpeg".

[ Status              ] [ Repository  ] [ Package                                      ]
  installed               alienbob        ffmpeg3-compat-3.4.6-x86_64-1alien          
  installed               ktown           ffmpegthumbs-19.12.2-x86_64-1alien          
  installed               nonslack        ffmpeg-compat32-4.2.1-x86_64-1aliencompat32 
  installed               restricted      ffmpeg-4.2.1-x86_64-1alien                  
  installed               slackware64     ffmpegthumbnailer-2.2.2-x86_64-1            
  uninstalled             alienbob        gst-plugins-ffmpeg0-0.10.13-x86_64-2alien   
  uninstalled(masked)     extra           ffmpeg-4.2.2-x86_64-1_alsa                  
  uninstalled(masked)     multilib        ffmpeg-compat32-4.2.2-x86_64-1compat32      
  uninstalled(masked)     slackware64     ffmpeg-4.2.2-x86_64-1

Only the ffmpeg-4.2.1-x86_64-1alien from restricted is displayed. Probably only one because they are named the same?

My slackpkgplus.conf:

Code:

PKGS_PRIORITY=( nonslack slackpkgplus multilib ktown testing restricted slackware64:id3lib alienbob )
REPOPLUS=( nonslack slackpkgplus multilib ktown restricted alienbob )
TAG_PRIORITY=off

zerouno · 02-16-2020, 07:08 AM

There is a condition for that bug.
If you install the non-Eric ffmpeg you see all ok. If you install alienbob or restricted ffmpeg you have the bug.
I'm investigating

chrisretusn · 02-16-2020, 10:36 AM

Quote:

Originally Posted by zerouno

You does not need that. Just put 'SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/' in slackpkgplus.conf then run slackpkg update

Hmm. Reread what I wrote above, my thinking cap was not screwed on very well.

My thinking was keep 'SBOURL=https://www.slackbuilds.org/slackbuilds/14.2/' enabled (uncommented) in slackpkgplus.conf. Add another variable e.g., 'SBOSHOW=on/off' to show/not show the "Also found in SBo:" list. The default would be "on", if "off", then it can be enabled via the CLI: 'SBOSHOW=on slackpkg search gnucash'

It's just an idea and not a big issue for me.

Quote:

You: slackpkg+ did not work properly when run as a package group instead single packages.
Me: Not really sure what you mean by package group.
You: ap , a , d , xap ... are package groups.

Ah.. yes.

It took some playing around by I think I have it figured out.
'slackpkg reinstall|install slackware64:d' for example.

chrisretusn · 02-16-2020, 11:00 AM

Quote:

Originally Posted by zerouno

There is a condition for that bug.
If you install the non-Eric ffmpeg you see all ok. If you install alienbob or restricted ffmpeg you have the bug.
I'm investigating

With an unchanged PKGS_PRIORITY, the now installed slackware64 version is missing.

Code:

PKGS_PRIORITY=( nonslack slackpkgplus multilib ktown testing restricted slackware64:id3lib alienbob )
[ Status              ] [ Repository ] [ Package                                               ]
  uninstalled(masked)     alienbob       ffmpeg-4.2.1-x86_64-1alien                           
  uninstalled(masked)     extra          ffmpeg-4.2.2-x86_64-1_alsa                           
  upgrade                 restricted     ffmpeg-4.2.2-x86_64-1 --> ffmpeg-4.2.1-x86_64-1alien

If I modify PKGS_PRIORITY to what is shown, everything is in place.

Code:

PKGS_PRIORITY=( nonslack slackpkgplus multilib ktown testing slackware64:ffmpeg restricted slackware64:id3lib alienbob )
The list below shows all packages with name matching "ffmpeg-4".

[ Status              ] [ Repository  ] [ Package                     ]
  installed               slackware64     ffmpeg-4.2.2-x86_64-1      
  uninstalled(masked)     alienbob        ffmpeg-4.2.1-x86_64-1alien 
  uninstalled(masked)     extra           ffmpeg-4.2.2-x86_64-1_alsa 
  uninstalled(masked)     restricted      ffmpeg-4.2.1-x86_64-1alien

Hope that helps. I'm looking through slackpkgplus.sh also, but my familiarity is lacking. That and it's past midnight.

zerouno · 02-16-2020, 12:08 PM

please, try to comment row 1146

Code:

          #grep ${GREPOPTS} -q " $PKGFULLNAME " ${TMPDIR}/tmplist && continue

in /usr/libexec/slackpkg/functions/slackpkgplus.sh

zerouno · 02-16-2020, 12:36 PM

Code:

With an unchanged PKGS_PRIORITY, the now installed slackware64 version is missing.

This may be correct since for the currently installed package "ffmpeg-4.2.2-x86_64-1" there is an upgrade available.

Unfortunately Eric chose to use the same tag for all his repositories, so duplicate names can happen and slackpkg can't know which is the installed package but only try to guess it. The complexity grows when the installed package with full name no longer is in the repository since there is an update available. In this case slackpkg+ can tell u in which repository is the new package but can't tell u in which repository was the original package.

This is the exact reason for which slackpkg+ does not show you the alienbob ffmpeg. And I don't know if I can fix it quickly.

zerouno · 02-16-2020, 01:09 PM

Quote:

Originally Posted by rworkman

Quote:

Also I've an uncommited patch that replace the spinning with a progress system; also it supports TERSE.

I might be interested in that for upstream... hint hint :-)

I reread the post. I did not read your nick

.

from slackpkgplus github:
git diff e48690319130149997d67f80b6c2a8313608c335 2993f0a512f343a96af8f0709b820286a950ada0 slackpkgplus.sh

in givepriority():

upgrade-all already know how many packages have to scan, so it can calculate the progress percentage
upgrade and install does not know it so I just print a counter.

Code:

    if [ "$CMD" == "upgrade-all" ];then
      if [ -z "$TOPROCESS" ];then
        TOPROCESS=$(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | comm -1 -2 - ${TMPDIR}/spkg|wc -l)
      fi
      let INPROGRESS++
      printf "%3s%%\b\b\b\b" "$[$INPROGRESS*100/$TOPROCESS]"
    else
      let INPROGRESS++
      printf "%4s\b\b\b\b" "$INPROGRESS"
    fi

at the end of code (before return to core slackpkg), before start the application:

Code:

INPROGRESS=0

Also a slower operation is not to search packages but to prepare the list to show:
showlist()

Code:

      q=$(echo $1|wc -w)
      c=1
      echo -n "Preparing list "
      if [ "$2" = "upgrade" ]; then

Code:

       else # other than 'upgrade'
 
         for i in $1; do
          printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]"
          let c++

Also I added a counter in upgrade_pkg() and install_pkg() that know the selected packages:

Code:

    q=$(echo $SHOWLIST|wc -w)

download packages:

Code:

      c=1
       for i in $SHOWLIST; do
        echo -n "[$c/$q]"
        let c++

install package:

Code:

    c=1
     for i in $SHOWLIST; do
...
       REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//')
      echo -n "[$c/$q]"
      let c++

Should not difficult to port it on mainstream. Tell me if you need more.

the full diff:

Code:

diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 053f8be..37746cd 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -292,20 +292,29 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     # Overrides original upgrade_pkg(). Required by the notification mechanism.
   function upgrade_pkg() {
     local i
+    local q
+    local c
+    q=$(echo $SHOWLIST|wc -w)
 
     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
     ls -1 $ROOT/var/log/packages/ > $TMPDIR/tmplist
 
+    c=1
     for i in $SHOWLIST; do
       PKGFOUND=$(grep -m1 -e "^$(echo $i|rev|cut -f4- -d-|rev)-[^-]\+-[^-]\+-[^-]\+$" $TMPDIR/tmplist)
       REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//')
+      echo -n "[$c/$q]"
+      let c++
       getpkg $i upgradepkg Upgrading
       if [ "$DOWNLOADONLY" != "on" ];then
         if [ -e "$ROOT/var/log/packages/$(echo $i|sed 's/\.t.z//')" ];then
@@ -322,21 +331,30 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     # Overrides original install_pkg(). Required by the notification mechanism.
   function install_pkg() {
     local i
-
+    local q
+    local c
+    
+    q=$(echo $SHOWLIST|wc -w)
     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
       INSTALL_T='installed:  '
       if [ -e $ROOT/var/log/packages/$(echo $i|sed 's/\.t.z//') ];then
         INSTALL_T='reinstalled:'
       fi
       REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//')
+      echo -n "[$c/$q]"
+      let c++
       getpkg $i installpkg Installing
       if [ "$DOWNLOADONLY" != "on" ];then
         if [ -e "$ROOT/var/log/packages/$(echo $i|sed 's/\.t.z//')" ];then
@@ -903,6 +921,17 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     unset LINEIDX
     unset PKGINFOS
 
+    if [ "$CMD" == "upgrade-all" ];then
+      if [ -z "$TOPROCESS" ];then
+        TOPROCESS=$(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | comm -1 -2 - ${TMPDIR}/spkg|wc -l)
+      fi
+      let INPROGRESS++
+      printf "%3s%%\b\b\b\b" "$[$INPROGRESS*100/$TOPROCESS]"
+    else
+      let INPROGRESS++
+      printf "%4s\b\b\b\b" "$INPROGRESS"
+    fi
+
     AUTOP=no
     if [[ "$CMD" == "upgrade" || "$CMD" == "upgrade-all" ]];then
       (
@@ -944,7 +973,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         FULLNAME=$(echo "${PKGDATA[5]}.${PKGDATA[7]}")
       fi
     fi
-
     for CPRIORITY in ${PRIORITY[@]} ; do
       [ "$PKGDATA" ] && break
 
@@ -1344,10 +1372,14 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         >$TMPDIR/greylist
       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++
           TMPONOFF=$ONOFF
           BASENAME=$(cutpkg $i)
           PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-[^-]\+-[^-]\+$" $TMPDIR/tmplist)
@@ -1376,6 +1408,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
       else # other than 'upgrade'
 
         for i in $1; do
+          printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]"
+          let c++
           TMPONOFF=$ONOFF
           REPOPOS=$(grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist|awk '{print $1}'|sed 's/SLACKPKGPLUS_//')
           ( echo $i;grep -m1 " $(echo $i|sed 's/\.t.z//') "  $TMPDIR/pkglist ) | grep -q -Ew -f $TMPDIR/greylist && TMPONOFF="off"
@@ -1575,6 +1609,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
 
   ### =========================== MAIN ============================ ###
 
+
+  SPINNING=off
+  #if [ "$CMD" == "upgrade-all" ];then SPINNING=off ;fi
+
   export LC_ALL=C
 
   if [ "$DOWNLOADONLY" == "on" ];then
@@ -2129,3 +2167,6 @@ if [ "$SLACKPKGPLUS" = "on" ];then
   fi # "$CMD" == "check-updates"
 
 fi
+
+INPROGRESS=0
+

phenixia2003 · 02-16-2020, 01:22 PM

Hello,

Quote:

Originally Posted by zerouno

please, try to comment row 1146

Code:

          #grep ${GREPOPTS} -q " $PKGFULLNAME " ${TMPDIR}/tmplist && continue

in /usr/libexec/slackpkg/functions/slackpkgplus.sh

It seems that issue is solved by the following patches :

slackpkg+-search-duplicate-packages-fix-V7.patch.txt which is attached to this post.
slackpkg+-search-fix-wrong-upgrade-info-bug.patch.txt which is attached to this post.

These patches were implemented to solve the issues reported starting at this post.

--
SeB

zerouno · 02-16-2020, 02:26 PM

Thankyou.
I'm sorry if I never applied it.

seems to have another issue after applying that patch:

Code:

# grep ffmpeg-4 /var/lib/slackpkg/pkglist
extra ffmpeg 4.2.2 x86_64 1_alsa ffmpeg-4.2.2-x86_64-1_alsa ./extra/pure-alsa-system txz
slackware64 ffmpeg 4.2.2 x86_64 1 ffmpeg-4.2.2-x86_64-1 ./slackware64/l txz
SLACKPKGPLUS_restricted ffmpeg 4.2.1 x86_64 1alien ffmpeg-4.2.1-x86_64-1alien ./SLACKPKGPLUS_restricted/ffmpeg txz
SLACKPKGPLUS_alienbob ffmpeg 4.2.1 x86_64 1alien ffmpeg-4.2.1-x86_64-1alien ./SLACKPKGPLUS_alienbob/ffmpeg txz
SLACKPKGPLUS_ponce ffmpeg 4.2.2 x86_64 1ponce ffmpeg-4.2.2-x86_64-1ponce ./SLACKPKGPLUS_ponce txz

# slackpkg search ffmpeg-4

Looking for ffmpeg-4 in package list. Please wait... DONE

The list below shows all packages with name matching "ffmpeg-4".

[ Status              ] [ Repository ] [ Package                                                     ]
  uninstalled(masked)     alienbob       ffmpeg-4.2.1-x86_64-1alien                                 
  uninstalled(masked)     extra          ffmpeg-4.2.2-x86_64-1_alsa                                 
  uninstalled(masked)     ponce          ffmpeg-4.2.2-x86_64-1ponce                                 
  upgrade                 restricted     extra:ffmpeg-4.2.2-x86_64-1 --> ffmpeg-4.2.1-x86_64-1alien 

# ls /var/log/packages/ffmpeg-4.2.2-x86_64-1 
ffmpeg-4.2.2-x86_64-1