- make relative symlinks (for vserver / chroot)

[packages/webapps.git] / webapps.sh

diff --git a/webapps.sh b/webapps.sh
index 945d706beef57ef3ad8d56c85aff03299383bf52..8d9efabf2683664cb91622c91d90536ee844c6e6 100644 (file)
--- a/webapps.sh
+++ b/webapps.sh
@@ -12,7 +12,7 @@ webapp_link() {
 
 webapp_register() {
        local link=$(webapp_link $app)
-       ln -sf $webapps/$app/$httpd.conf /etc/$httpd/webapps.d/$link.conf
+       ln -sf ../../..$webapps/$app/$httpd.conf /etc/$httpd/webapps.d/$link.conf
 }
 
 webapp_unregister() {
@@ -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=$(basename $conf .conf)
                        echo "- $app"
                done
        done