- fixed MSB repository link

- smaller output for slackpkg search
This commit is contained in:
Matteo Rossini 2016-12-14 20:35:19 +01:00
parent 12bf31a485
commit 6ac77cb4cd
2 changed files with 9 additions and 7 deletions

View file

@ -9,7 +9,7 @@ Supported Repositories:
> mleddesktop: http://www.microlinux.fr/microlinux/desktop-{14.1,14.2}-{32,64}bit/ > mleddesktop: http://www.microlinux.fr/microlinux/desktop-{14.1,14.2}-{32,64}bit/
> mledextras: http://www.microlinux.fr/microlinux/extras-{14.1,14.2}-{32,64}bit/ > mledextras: http://www.microlinux.fr/microlinux/extras-{14.1,14.2}-{32,64}bit/
> mles: http://www.microlinux.fr/microlinux/server-{14.0,14.1,14.2}-{32,64}bit/ > mles: http://www.microlinux.fr/microlinux/server-{14.0,14.1,14.2}-{32,64}bit/
> msb: http://slackware.uk/msb/{14.0,14.1,14.2,current}/{1.6,1.8,1.10,1.12,1.14,1.16,latest}/{x86,x86_64}/ > msb: http://slackware.uk/msb/{14.0,14.1,14.2,current}/{1.6,1.8,1.10,1.12,1.14,1.16,1.17,latest}/{x86,x86_64}/
> csb: http://slackware.uk/csb/{14.1,14.2}/{x86,x86_64}/ > csb: http://slackware.uk/csb/{14.1,14.2}/{x86,x86_64}/
> slackers: http://slack.conraid.net/repository/slackware64-current/ > slackers: http://slack.conraid.net/repository/slackware64-current/
> slacke18: http://ngc891.blogdns.net/pub/slacke18/slackware{,64}-{14.1,14.2}/ > slacke18: http://ngc891.blogdns.net/pub/slacke18/slackware{,64}-{14.1,14.2}/

View file

@ -1114,7 +1114,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
local REPO local REPO
local PNAME local PNAME
printf "[ %-16s ] [ %-24s ] [ %-40s ]\n" "Status" "Repository" "Package" {
echo "[ Status#] [ Repository#] [ Package# ]"
INSTPKGS="$(ls -f $ROOT/var/log/packages)" INSTPKGS="$(ls -f $ROOT/var/log/packages)"
@ -1158,18 +1159,19 @@ if [ "$SLACKPKGPLUS" = "on" ];then
# If installed is it uptodate? # If installed is it uptodate?
if [ "${CINSTPKG}" = "${RAWNAME}" ]; then if [ "${CINSTPKG}" = "${RAWNAME}" ]; then
STATUS=" installed " STATUS="installed"
printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "$CINSTPKG" echo " $STATUS# $REPO# $CINSTPKG"
else else
STATUS="upgrade" STATUS="upgrade"
printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "$CINSTPKG --> ${RAWNAME}" echo " $STATUS# $REPO# $CINSTPKG --> ${RAWNAME}"
fi fi
fi fi
done done
else else
printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "${RAWNAME}" echo " $STATUS# $REPO# ${RAWNAME}"
fi fi
done|sort|( [[ "$CMD" == "search" ]]&&grep -E -i --color -e ^ -e "$PATTERN"||cat ) done|sort
}|column -t -s '#' -o ' '|( [[ "$CMD" == "search" ]]&&grep -E -i --color -e ^ -e "$PATTERN"||cat )
} # END function searchlistEX() } # END function searchlistEX()
# Show detailed info for slackpkg info # Show detailed info for slackpkg info