diff options
| author | Derrell Lipman <derrell@samba.org> | 2006-10-06 15:50:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:20:42 -0500 |
| commit | 250399c9230ea972f6bf374fb9951b6cb35320f2 (patch) | |
| tree | 153429c2707deb90857c1ad258b96449ddd67af2 | |
| parent | 10c06a1968dbf39d8a3790077a3537b8323f36ff (diff) | |
| download | samba-250399c9230ea972f6bf374fb9951b6cb35320f2.tar.gz samba-250399c9230ea972f6bf374fb9951b6cb35320f2.tar.bz2 samba-250399c9230ea972f6bf374fb9951b6cb35320f2.zip | |
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)
| -rw-r--r-- | services/json.esp (renamed from jsonrpc/json.esp) | 0 | ||||
| -rw-r--r-- | services/json_auth.esp (renamed from jsonrpc/json_auth.esp) | 0 | ||||
| -rw-r--r-- | services/jsondate.esp (renamed from jsonrpc/jsondate.esp) | 0 | ||||
| -rw-r--r-- | services/qooxdoo/test.esp (renamed from jsonrpc/qooxdoo/test.esp) | 0 | ||||
| -rw-r--r-- | services/request.esp (renamed from jsonrpc/request.esp) | 0 | ||||
| -rw-r--r-- | source4/script/installswat.sh | 12 |
6 files changed, 12 insertions, 0 deletions
diff --git a/jsonrpc/json.esp b/services/json.esp index 6c59db0fca..6c59db0fca 100644 --- a/jsonrpc/json.esp +++ b/services/json.esp diff --git a/jsonrpc/json_auth.esp b/services/json_auth.esp index 2d58b6e2af..2d58b6e2af 100644 --- a/jsonrpc/json_auth.esp +++ b/services/json_auth.esp diff --git a/jsonrpc/jsondate.esp b/services/jsondate.esp index 3467228df6..3467228df6 100644 --- a/jsonrpc/jsondate.esp +++ b/services/jsondate.esp diff --git a/jsonrpc/qooxdoo/test.esp b/services/qooxdoo/test.esp index e8686dcc25..e8686dcc25 100644 --- a/jsonrpc/qooxdoo/test.esp +++ b/services/qooxdoo/test.esp diff --git a/jsonrpc/request.esp b/services/request.esp index 1cd22a71a8..1cd22a71a8 100644 --- a/jsonrpc/request.esp +++ b/services/request.esp diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh index 4304e3e490..72dfc2f456 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 |