Fixed output of wiki things. Added headlines.

diff --git a/tools/make-interactive b/tools/make-interactive
index 21ec89579ccb44afbb87cec0c1fb523f333ef9a3..af1b855a61ffaa38b10502bea391827f389ea8d2 100644 (file)
--- 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 3e40e15e8454d686a3ecddb322899d9426dee22e..a9759f766dbd900452e814a1cae316b4265b9368 100644 (file)
--- 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