- fully canonicalize webapp link when displaying list; rel 5

Changed files:
    webapps.sh -> 1.18
    webapps.spec -> 1.29

diff --git a/webapps.sh b/webapps.sh
index bc79e2594d53b2fae5e0d38867b2fb33b3f9879c..8ec93b03136a6cb1f5a44af860313f5cb233b818 100644 (file)
--- a/webapps.sh
+++ b/webapps.sh
@@ -27,7 +27,7 @@ webapp_list() {
                echo "$server:"
                for conf in /etc/$server/webapps.d/*; do
                        [ -L $conf ] || continue
-                       app=$(readlink $conf | sed -e "s,.*$webapps/,,;s,/$server.conf$,,")
+                       app=$(readlink -f $conf | sed -e "s,$webapps/,,;s,/$server.conf$,,")
                        echo "- $app"
                done
        done

diff --git a/webapps.spec b/webapps.spec
index c33dd7d9534cc01a33cae0ffcb2e8c24fef73328..c5b254d6b3c2a69c38ce7d59721cd2c08ce81ca6 100644 (file)
--- a/webapps.spec
+++ b/webapps.spec
@@ -2,7 +2,7 @@ Summary:        webapps framework
 Summary(pl.UTF-8):     Szkielet dla aplikacji WWW
 Name:          webapps
 Version:       0.3.1
-Release:       4
+Release:       5
 License:       GPL
 Group:         Applications/WWW
 Source0:       %{name}.README