CSPACE-4684,CSPACE-4728: In script for prepping a working Apache Tomcat folder for...

diff --git a/scripts/nightlyDist.sh b/scripts/nightlyDist.sh
index af05c8d9ec222573b54c8258c4a0ea0785858eff..5b190903390beb15ecb06a221d3f0ae45d578a97 100755 (executable)
--- a/scripts/nightlyDist.sh
+++ b/scripts/nightlyDist.sh
@@ -88,9 +88,11 @@ echo "Removing nightly-specific and other host-specific config files ..."
 find $APP_LAYER_CONFIG_DIR -name nightly-settings.xml -delete
 find $APP_LAYER_CONFIG_DIR -name local-settings.xml -delete
 
-# FIXME: Need to add an action here to copy each instance of the
-# file settings.xml, found in each App layer tenant folder, to
-# a file named local-settings.xml files in each of those folder(s)
+# This command was tested with Fedora Linux 10; other Linux distros and other
+# Unix-like operating systems may have slight variations on 'execdir', etc.
+echo "Copying settings.xml files to local-settings.xml for each tenant ..."
+find $APP_LAYER_CONFIG_DIR/tenants -mindepth 1 -maxdepth 1 -type d \
+  -execdir /bin/cp -p '{}'/settings.xml '{}'/local-settings.xml \;
 
 echo "Removing services JAR files ..."
 rm -Rf $CATALINA_LIB_DIR/cspace-services-authz.jar