- preserve perms

[packages/webapps.git] / webapps.sh

diff --git a/webapps.sh b/webapps.sh
index 8d9efabf2683664cb91622c91d90536ee844c6e6..bc79e2594d53b2fae5e0d38867b2fb33b3f9879c 100644 (file)
--- a/webapps.sh
+++ b/webapps.sh
@@ -27,25 +27,67 @@ webapp_list() {
                echo "$server:"
                for conf in /etc/$server/webapps.d/*; do
                        [ -L $conf ] || continue
-                       app=$(basename $conf .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}":
+       echo "available webapps"
        for app in /etc/webapps/*; do
                [ -d $app ] || continue
 
                servers=""
-               for server in ${1:-$webservers}; do
+               for server in $webservers; do
                        [ -f $app/$server.conf ] || continue
                        servers="$servers${servers:+ }$server"
                done
 
                [ "$servers" ] || continue
-               echo "- $(basename $app) ($servers)"
+               echo "- ${app##*/} ($servers)"
        done
 }
 
@@ -99,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