diff --git a/src/repositories.txt b/src/repositories.txt index a46220c..b6c4a49 100644 --- a/src/repositories.txt +++ b/src/repositories.txt @@ -9,7 +9,7 @@ Supported Repositories: > 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/ > 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}/ > slackers: http://slack.conraid.net/repository/slackware64-current/ > slacke18: http://ngc891.blogdns.net/pub/slacke18/slackware{,64}-{14.1,14.2}/ diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh index 341980f..7ad148a 100755 --- a/src/slackpkgplus.sh +++ b/src/slackpkgplus.sh @@ -1114,7 +1114,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then local REPO local PNAME - printf "[ %-16s ] [ %-24s ] [ %-40s ]\n" "Status" "Repository" "Package" + { + echo "[ Status#] [ Repository#] [ Package# ]" INSTPKGS="$(ls -f $ROOT/var/log/packages)" @@ -1158,18 +1159,19 @@ if [ "$SLACKPKGPLUS" = "on" ];then # If installed is it uptodate? if [ "${CINSTPKG}" = "${RAWNAME}" ]; then - STATUS=" installed " - printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "$CINSTPKG" + STATUS="installed" + echo " $STATUS# $REPO# $CINSTPKG" else STATUS="upgrade" - printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "$CINSTPKG --> ${RAWNAME}" + echo " $STATUS# $REPO# $CINSTPKG --> ${RAWNAME}" fi fi done else - printf " %-20s %-24s %-40s \n" "$STATUS" "$REPO" "${RAWNAME}" + echo " $STATUS# $REPO# ${RAWNAME}" 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() # Show detailed info for slackpkg info