Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-27 09:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extends percentage where possible.

Browse source
This commit is contained in:
Matteo Rossini 2020-02-24 23:58:45 +01:00
parent 968f53ca6c
commit 3150b2e0ff
1 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/slackpkgplus.sh
View file

@ -944,15 +944,24 @@ if [ "$SLACKPKGPLUS" = "on" ];then
unset LINEIDX unset LINEIDX
unset PKGINFOS unset PKGINFOS
if [ "$CMD" == "upgrade-all" ];then if [ -z "$TOPROCESS" ];then
if [ -z "$TOPROCESS" ];then case "$CMD" in
TOPROCESS=$(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | comm -1 -2 - ${TMPDIR}/spkg|wc -l) upgrade-all) TOPROCESS=$(comm -1 -2 ${TMPDIR}/lpkg ${TMPDIR}/dpkg | comm -1 -2 - ${TMPDIR}/spkg|wc -l);;
fi install-new) TOPROCESS=$(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt|wc -l);;
let INPROGRESS++ install|upgrade|reinstall)
printf "%3s%%\b\b\b\b" "$[$INPROGRESS*100/$TOPROCESS]" TOPROCESS=0
else for ARGUMENT in $(echo $INPUTLIST); do
TOPROCESS=$[$TOPROCESS+$(grep -w -- "${ARGUMENT}" ${TMPDIR}/pkglist | cut -f2 -d\ | sort -u|wc -l)]
done
;;
esac
fi
if [ -z "$TOPROCESS" ];then
let INPROGRESS++ let INPROGRESS++
printf "%4s\b\b\b\b" "$INPROGRESS" printf "%4s\b\b\b\b" "$INPROGRESS"
else
let INPROGRESS++
printf "%3s%%\b\b\b\b" "$[$INPROGRESS*100/$TOPROCESS]"
fi fi
AUTOP=no AUTOP=no
@ -1121,8 +1130,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
PKGLIST=$(tempfile --directory=$TMPDIR) PKGLIST=$(tempfile --directory=$TMPDIR)
PKGINFOS=$(tempfile --directory=$TMPDIR) PKGINFOS=$(tempfile --directory=$TMPDIR)
PRITOPROCESS=${#PRIORITY[@]}
PRIINPROGRESS=0
for i in ${PRIORITY[@]}; do for i in ${PRIORITY[@]}; do
PRIPERCBASE=$[$PRIINPROGRESS*10000/$PRITOPROCESS]
DIR="$i" DIR="$i"
PAT="" PAT=""
if [[ "$DIR" =~ ^[-_[:alnum:]]+[:] ]] ; then # was if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then if [[ "$DIR" =~ ^[-_[:alnum:]]+[:] ]] ; then # was if echo "$DIR" | grep -q "[a-zA-Z0-9]\+[:]" ; then
@ -1175,8 +1187,12 @@ if [ "$SLACKPKGPLUS" = "on" ];then
else # -- CMD==search else # -- CMD==search
grep -h ${GREPOPTS} "^$DIR" ${TMPDIR}/pkglist ${TMPDIR}/pkglist-pre|grep -E ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/|/$SEARCHSTR/|/$SEARCHSTR | [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS grep -h ${GREPOPTS} "^$DIR" ${TMPDIR}/pkglist ${TMPDIR}/pkglist-pre|grep -E ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/|/$SEARCHSTR/|/$SEARCHSTR | [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS
fi fi
PKGTOPROCESS=$(cat $PKGINFOS|wc -l)
PKGINPROGRES=0
while read PKGDIR PKGBASENAME PKGVER PKGARCH PKGBUILD PKGFULLNAME PKGPATH PKGEXT ; do while read PKGDIR PKGBASENAME PKGVER PKGARCH PKGBUILD PKGFULLNAME PKGPATH PKGEXT ; do
let PKGINPROGRES++
printf "%3s%%\b\b\b\b" "$[$[$PRIPERCBASE+$PKGINPROGRES*10000/$PKGTOPROCESS/$PRITOPROCESS]/100]"
# does nothing when the package has been handled ... # does nothing when the package has been handled ...
grep ${GREPOPTS} -q "^repo:${PKGDIR}:bname:${PKGBASENAME}:ver:${PKGVER}:fname:${PKGFULLNAME}:" $PKGLIST && continue grep ${GREPOPTS} -q "^repo:${PKGDIR}:bname:${PKGBASENAME}:ver:${PKGVER}:fname:${PKGFULLNAME}:" $PKGLIST && continue
@ -1213,6 +1229,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo "repo:${PKGDIR}:bname:${PKGBASENAME}:ver:${PKGVER}:fname:${PKGFULLNAME}:" >> $PKGLIST echo "repo:${PKGDIR}:bname:${PKGBASENAME}:ver:${PKGVER}:fname:${PKGFULLNAME}:" >> $PKGLIST
done < $PKGINFOS done < $PKGINFOS
let PRIINPROGRESS++
done done
rm ${TMPDIR}/waiting rm ${TMPDIR}/waiting
rm -f $PKGLIST $PKGINFOS rm -f $PKGLIST $PKGINFOS
@ -1242,7 +1259,12 @@ if [ "$SLACKPKGPLUS" = "on" ];then
INSTPKGS="$(ls -f $ROOT/var/log/packages/)" INSTPKGS="$(ls -f $ROOT/var/log/packages/)"
c=0
q=$(echo ${1}|wc -w)
echo -n "Preparing list " >&2
for i in $1; do for i in $1; do
let c++
printf "%10s\b\b\b\b\b\b\b\b\b\b" "[$c/$q]" >&2
REPO=${i/:*/} #$(echo "$i" | cut -f1 -d":") REPO=${i/:*/} #$(echo "$i" | cut -f1 -d":")
PNAME=${i/*:/} #PNAME=$(echo "$i" | cut -f2- -d":") PNAME=${i/*:/} #PNAME=$(echo "$i" | cut -f2- -d":")
@ -1301,6 +1323,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo " $STATUS# $REPO# ${RAWNAME}" echo " $STATUS# $REPO# ${RAWNAME}"
fi fi
done|sort done|sort
echo -en "\r" >&2
}|column -t -s '#' -o ' '|( [[ "$CMD" == "search" ]]&&grep -E -i --color -e ^ -e "$PATTERN"||cat ) }|column -t -s '#' -o ' '|( [[ "$CMD" == "search" ]]&&grep -E -i --color -e ^ -e "$PATTERN"||cat )
} # END function searchlistEX() } # END function searchlistEX()