From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Feb 2009 23:35:11 +0000 (+0100)
Subject: Fixed output of wiki things. Added headlines.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c6d1919545a36df69a21688879e28cb3dd8611;p=ipfire-3.x.git

Fixed output of wiki things. Added headlines.
---

diff --git a/tools/make-interactive b/tools/make-interactive
index 21ec89579..af1b855a6 100644
--- a/tools/make-interactive
+++ b/tools/make-interactive
@@ -322,7 +322,7 @@ package*|pkg)
 			done
 			;;
 		group*)
-			echo "====== All available groups of packages in ${NAME}-${VERSION} ======"
+			echo "#### All available groups of packages in ${NAME}-${VERSION} ####"
 			echo
 			for group in $(pkg_list_groups); do
 				echo "  * ${group}"
@@ -332,6 +332,8 @@ package*|pkg)
 			pkg_info $3
 			;;
 		wikigroup*)
+			echo "====== All available groups of packages in ${NAME}-${VERSION} ======"
+			echo
 			pkg_list_groups_wiki
 			;;
 		wikiinfo)
diff --git a/tools/make-packages b/tools/make-packages
index 3e40e15e8..a9759f766 100644
--- a/tools/make-packages
+++ b/tools/make-packages
@@ -27,14 +27,16 @@ pkg_list_groups() {
 }
 
 pkg_list_groups_wiki() {
+	local group
+	local package
 	for group in $(pkg_list_groups); do
-		echo "$group"
+		echo "===== $group ====="
 		for package in $BASEDIR/lfs/*; do
 			(	unset NAME VERSION
 				eval $(pkg_info ${package})
 				if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ] && [ "$GROUP" = "$group" ]; then
 					[ -n "$VERSION" ] && NAME="${NAME}-${VERSION}"
-					echo "  * [[.:package:$package|${NAME}]] - ${SHORT}"
+					echo "  * [[.:package:$(basename $package)|${NAME}]] - ${SHORT}"
 				fi
 			)
 		done