spk diff spk-ls @ rev 69

Update to use new colorize
author Christian Mesh <meshca@clarkson.edu>
date Sat May 19 03:51:05 2012 -0500 (2012-05-19)
parents 36c7fb7707d0
children a946ed77f727
line diff
     1.1 --- a/spk-ls	Fri May 18 02:49:36 2012 +0200
     1.2 +++ b/spk-ls	Sat May 19 03:51:05 2012 -0500
     1.3 @@ -54,7 +54,7 @@
     1.4  			exit 0 ;;
     1.5  		--mirror)
     1.6  			newline
     1.7 -			boldify "$(gettext "Mirror") $(cat $mirrorurl)"
     1.8 +			boldify $(gettext "Mirror") $(cat $mirrorurl)
     1.9  			read_pkgsdesc $pkgsdesc
    1.10  			separator
    1.11  			boldify $(count_mirrored)
    1.12 @@ -64,10 +64,10 @@
    1.13  				for extra in $extradb/*
    1.14  				do
    1.15  					newline
    1.16 -					boldify "$(gettext "Extra mirror")"
    1.17 +					boldify $(gettext "Extra mirror")
    1.18  					if [ ! -f "$extra/packages.desc" ]; then
    1.19  						echo "URL: $(cat $extra/mirror)"
    1.20 -						gettext "Missing:"; colorize " packages.desc" 31
    1.21 +						gettext "Missing:"; colorize 31" packages.desc"
    1.22  						continue
    1.23  					fi
    1.24  					separator
    1.25 @@ -82,16 +82,16 @@
    1.26  			if [ -s "$blocked" ]; then
    1.27  				cat $blocked
    1.28  			else
    1.29 -				gettext "No blocked packages"; echo ""
    1.30 +				gettext "No blocked packages"; newline
    1.31  			fi && exit 0 ;;
    1.32  		--short)
    1.33  			newline
    1.34 -			boldify "$(gettext "Installed packages")"
    1.35 +			boldify $(gettext "Installed packages")
    1.36  			separator
    1.37  			for pkg in $(ls -1 $installed)
    1.38  			do
    1.39  				. $installed/$pkg/receipt
    1.40 -				echo -n "$(colorize "$pkg" 32)"; indent 28 " $VERSION"
    1.41 +				echo -n "$(colorize 32 $pkg)"; indent 28 " $VERSION"
    1.42  			done
    1.43  			separator
    1.44  			boldify $(count_installed)
    1.45 @@ -110,12 +110,12 @@
    1.46  				if [ "$modifiers" ]; then
    1.47  					modifiers=$installed/$pkg/modifiers
    1.48  					if [ -f "$modifiers" ]; then
    1.49 -						boldify "$(gettext "Modifiers for") $pkg"
    1.50 +						boldify $(gettext "Modifiers for") $pkg
    1.51  						separator
    1.52  						cat $modifiers
    1.53  						separator && newline
    1.54  					else
    1.55 -						echo -n "$(boldify "$pkg") "
    1.56 +						echo -n "$(boldify $pkg) "
    1.57  						gettext "package was not modified"; newline
    1.58  					fi
    1.59  					continue
    1.60 @@ -125,7 +125,7 @@
    1.61  				cat $installed/$pkg/files.list
    1.62  				separator
    1.63  				gettext "Installed files by"; echo -n " $pkg: "
    1.64 -				colorize "$nb" 32 && newline
    1.65 +				colorize 32 "$nb" && newline
    1.66  			done && exit 0 ;;
    1.67  	esac
    1.68  done
    1.69 @@ -145,7 +145,7 @@
    1.70  	. $pkg/receipt
    1.71  	count=$(($count + 1))
    1.72  	[ "$count" != 1 ] && newline
    1.73 -	gettext "Package    :"; colorize " $PACKAGE" 32
    1.74 +	gettext "Package    :"; colorize 32 " $PACKAGE"
    1.75  	receipt_info
    1.76  done
    1.77  separator