SOURCES: webapps.sh - avoid findutils dep - improved output

glen glen at pld-linux.org
Fri Jan 6 18:57:47 CET 2006


Author: glen                         Date: Fri Jan  6 17:57:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- avoid findutils dep
- improved output

---- Files affected:
SOURCES:
   webapps.sh (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/webapps.sh
diff -u SOURCES/webapps.sh:1.10 SOURCES/webapps.sh:1.11
--- SOURCES/webapps.sh:1.10	Fri Jan  6 16:09:56 2006
+++ SOURCES/webapps.sh	Fri Jan  6 18:57:40 2006
@@ -35,10 +35,17 @@
 
 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
+	for app in /etc/webapps/*; do
+		[ -d $app ] || continue
+
+		servers=""
+		for server in ${1:-$webservers}; do
+			[ -f $app/$server.conf ] || continue
+			servers="$servers${servers:+ }$server"
+		done
+
+		[ "$servers" ] || continue
+		echo "- $(basename $app) ($servers)"
 	done
 }
 
@@ -57,7 +64,7 @@
 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
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/webapps.sh?r1=1.10&r2=1.11&f=u



More information about the pld-cvs-commit mailing list