- add list apps-regsitered and unregistered for bash completion

[packages/webapps.git] / webapps.sh

diff --git a/webapps.sh b/webapps.sh
index 1842e42dda7187db38b72bdd2a7e249c26b8865d..515a3f0d430be711e815d36b7f2cc95cd91b503d 100644 (file)
--- a/webapps.sh
+++ b/webapps.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 webapps=/etc/webapps
 webservers='apache httpd lighttpd'
 action="$1"
@@ -11,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() {
@@ -26,18 +27,62 @@ 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 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=$(basename $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"
+       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 "- $(basename $app) ($servers)"
+       done
+}
+
 usage() {
        cat >&2 <<EOF
 Usage: $0 register httpd webapp
 Usage: $0 register httpd webapp/module
 Usage: $0 unregister httpd webapp
 Usage: $0 unregister httpd webapp/module
+Usage: $0 list [$webservers]
+Usage: $0 list-apps [$webservers]
 
 Where httpd is one of the webservers
 apache 1.x: apache
@@ -45,7 +90,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
 }
 
@@ -56,8 +101,8 @@ die() {
 
 checkconfig() {
        if [ -z "$httpd" ] || [ -z "$app" ]; then
-               usage
-               return
+               usage
+               return 1
        fi
 
        # sanity check
@@ -71,16 +116,21 @@ checkconfig() {
 
 case "$action" in
 register)
-       checkconfig
-       webapp_register
+       checkconfig && webapp_register
        ;;
 unregister)
-       checkconfig
-       webapp_unregister
+       checkconfig && webapp_unregister
        ;;
 list)
        webapp_list $2
        ;;
+list-apps|list-apps-registered|list-apps-unregistered)
+       if [ "$2" ]; then
+               webapp_applist $action $2
+       else
+               webapp_list_apps
+       fi
+       ;;
 *)
        usage
        exit 1