From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 1 Oct 2010 06:51:19 +0000 (+0000)
Subject: - fully canonicalize webapp link when displaying list; rel 5
X-Git-Tag: auto/ac/webapps-0_3_1-5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fwebapps.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fwebapps-0_3_1-5

- 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 bc79e25..8ec93b0 100644
--- 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 c33dd7d..c5b254d 100644
--- 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