- preserve perms

[packages/webapps.git] / webapps.sh

diff --git a/webapps.sh b/webapps.sh
index 281ab38134c7da7af83019f1cb5ae5377fe0280f..bc79e2594d53b2fae5e0d38867b2fb33b3f9879c 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,18 +27,67 @@ 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 $conf | sed -e "s,.*$webapps/,,;s,/$server.conf$,,")
                        echo "- $app"
                done
        done
 }
 
+# return registered application list for webserver
+# useful for bash_completion parsing
+webapp_apps_registered() {
+       local action="$1"
+       local server=$2
+
+       for conf in /etc/$server/webapps.d/*.conf; do
+               [ -L $conf ] || continue
+               appname=$(readlink $conf)
+               appname=${appname#*$webapps/}
+               appname=${appname%/$server.conf}
+               [ -f /etc/webapps/$appname/$server.conf ] || continue
+               echo $appname
+       done
+}
+
+# return application list for webserver
+# useful for bash_completion parsing
+webapp_applist() {
+       local action="$1"
+       local server=$2
+
+       for app in /etc/webapps/*; do
+               [ -d $app ] || continue
+               [ -f $app/$server.conf ] || continue
+               local appname=${app##*/}
+               local link=$(webapp_link $appname)
+
+               case "$action" in
+               *-registered)
+                       [ -f /etc/$server/webapps.d/$link.conf ] && echo $appname
+                       ;;
+               *-unregistered)
+                       [ -f /etc/$server/webapps.d/$link.conf ] || echo $appname
+                       ;;
+               *)
+                       echo $appname
+               ;;
+               esac
+       done
+}
+
 webapp_list_apps() {
-       echo "available webapps${1:+ for $1}":
-       for server in ${1:-\\*}; do
-               for app in `ls /etc/webapps`; do
-                       eval find /etc/webapps/$app -name $server.conf -printf '"- $app\n"'
-               done | uniq
+       echo "available webapps"
+       for app in /etc/webapps/*; do
+               [ -d $app ] || continue
+
+               servers=""
+               for server in $webservers; do
+                       [ -f $app/$server.conf ] || continue
+                       servers="$servers${servers:+ }$server"
+               done
+
+               [ "$servers" ] || continue
+               echo "- ${app##*/} ($servers)"
        done
 }
 
@@ -57,7 +106,7 @@ apache 2.x: httpd
 lighttpd: lighttpd
 
 webapp modules are supported,
-drupal tinymce module webapp name would be drupal/tinymce.
+"drupal tinymce" module webapp name would be "drupal/tinymce".
 EOF
 }
 
@@ -92,7 +141,21 @@ list)
        webapp_list $2
        ;;
 list-apps)
-       webapp_list_apps $2
+               webapp_list_apps
+       ;;
+list-apps-registered)
+       if [ "$2" ]; then
+               webapp_apps_registered $action $2
+       else
+               webapp_list_apps
+       fi
+       ;;
+list-apps-unregistered)
+       if [ "$2" ]; then
+               webapp_applist $action $2
+       else
+               webapp_list_apps
+       fi
        ;;
 *)
        usage