# HG changeset patch
# User Christian Mesh <meshca@clarkson.edu>
# Date 1338679020 18000
# Node ID f017035fd1f56a1060e03758efb24841a8345dfe
# Parent  37137af42a776a14f210243ba11e23384a997699
Clean spk-ls, fix output I broke in libspk

diff -r 37137af42a77 -r f017035fd1f5 lib/libspk.sh
--- a/lib/libspk.sh	Sat Jun 02 17:58:18 2012 -0500
+++ b/lib/libspk.sh	Sat Jun 02 18:17:00 2012 -0500
@@ -62,7 +62,7 @@
 	cat $list | while read package version desc category
 	do
 		if [ "$short" ]; then
-			colorize 32 "$package"; indent 28 " $version"
+			echo $(colorize 32 "$package") $(indent 28 " $version")
 		else
 			newline
 			gettext "Package    :"; colorize 32 " $package"
@@ -245,7 +245,7 @@
 check_installed() {
 	local name="$1"
 	if [ -d "$installed/$name" ]; then
-		boldify "$name"; gettext "package is already installed"
+		echo $(boldify "$name") $(gettext "package is already installed")
 		[ "$forced" ] || rm -rf $tmpdir
 		continue
 	fi
diff -r 37137af42a77 -r f017035fd1f5 spk-ls
--- a/spk-ls	Sat Jun 02 17:58:18 2012 -0500
+++ b/spk-ls	Sat Jun 02 18:17:00 2012 -0500
@@ -40,18 +40,6 @@
 	exit 0
 }
 
-# Source a package receipt
-source_receipt() {
-	local receipt=$1
-	if [ ! -f $receipt ]; then
-		echo -n $(colorize 31 "$pkg")
-		indent 28 $(gettext "missing receipt")
-		continue
-	else
-		. $receipt
-	fi
-}
-
 #
 # Handle --options
 #
@@ -106,7 +94,7 @@
 			for pkg in $(ls -1 $installed)
 			do
 				source_receipt $installed/$pkg/receipt
-				echo -n "$(colorize 32 $pkg)"; indent 28 "$VERSION"
+				echo -n $(colorize 32 $pkg) $(indent 28 "$VERSION")
 			done
 			separator
 			boldify $(count_installed)
@@ -139,7 +127,7 @@
 				separator
 				cat $installed/$pkg/files.list
 				separator
-				echo -n "$(gettext "Installed files by") $pkg: "
+				echo -n $(gettext "Installed files by") $pkg: 
 				colorize 32 "$nb" && newline
 			done
 			exit 0 ;;
@@ -158,7 +146,7 @@
 for pkg in $installed/*
 do
 	unset_receipt
-	. $pkg/receipt
+	source_receipt $pkg/receipt
 	count=$(($count + 1))
 	[ "$count" != 1 ] && newline
 	gettext "Package    :"; colorize 32 " $PACKAGE"