From: Derrell Lipman <derrell@samba.org>
Date: Fri, 6 Oct 2006 15:50:26 +0000 (+0000)
Subject: r19142: ensure no race conditions during installation by having same name in source... 
X-Git-Tag: samba-4.0.0alpha6~801^3~4561
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=250399c9230ea972f6bf374fb9951b6cb35320f2;p=thirdparty%2Fsamba.git

r19142: ensure no race conditions during installation by having same name in source and swat directory; install new apps and services
(This used to be commit a2b996317f81aa61d7d5bf427003399560e64f77)
---

diff --git a/jsonrpc/json.esp b/services/json.esp
similarity index 100%
rename from jsonrpc/json.esp
rename to services/json.esp
diff --git a/jsonrpc/json_auth.esp b/services/json_auth.esp
similarity index 100%
rename from jsonrpc/json_auth.esp
rename to services/json_auth.esp
diff --git a/jsonrpc/jsondate.esp b/services/jsondate.esp
similarity index 100%
rename from jsonrpc/jsondate.esp
rename to services/jsondate.esp
diff --git a/jsonrpc/qooxdoo/test.esp b/services/qooxdoo/test.esp
similarity index 100%
rename from jsonrpc/qooxdoo/test.esp
rename to services/qooxdoo/test.esp
diff --git a/jsonrpc/request.esp b/services/request.esp
similarity index 100%
rename from jsonrpc/request.esp
rename to services/request.esp
diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
index 4304e3e490f..72dfc2f4563 100644
--- a/source4/script/installswat.sh
+++ b/source4/script/installswat.sh
@@ -19,6 +19,7 @@ installdir() {
     done
 }
 
+installdir `find . -name '*.html'`
 installdir `find . -name '*.js'`
 installdir `find . -name '*.esp'`
 installdir `find . -name '*.css'`
@@ -33,5 +34,16 @@ The swat files have been installed.
 ======================================================================
 EOF
 
+cd $SRCDIR/.. || exit 1
+
+installdir `find services -name '*.esp'`
+
+cat << EOF
+======================================================================
+The JSON-RPC services have been installed. 
+======================================================================
+EOF
+
+
 exit 0