[VID-6] Strip carriage returns from scripts

[vid.git] / deliveries / src / main / scripts / localize_log4j.sh

diff --git a/deliveries/src/main/scripts/localize_log4j.sh b/deliveries/src/main/scripts/localize_log4j.sh
index b3442c8..d2ab2bb 100755 (executable)
--- a/deliveries/src/main/scripts/localize_log4j.sh
+++ b/deliveries/src/main/scripts/localize_log4j.sh
@@ -1,19 +1,19 @@
-#!/bin/bash\r
-\r
-FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j.properties\r
-TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j_template.properties\r
-\r
-echo "Localizing the VID log4j configuration"\r
-\r
-mkdir -p ${LOG4J_LOGS_DIRECTORY}\r
-\r
-sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \\r
-       -e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \\r
-       -e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {\r
-               echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"\r
-               exit 3\r
-       }\r
-\r
-echo "Localized ${FINAL_CONFIG_FILE} successfully."\r
-\r
-\r
+#!/bin/bash
+
+FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j.properties
+TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j_template.properties
+
+echo "Localizing the VID log4j configuration"
+
+mkdir -p ${LOG4J_LOGS_DIRECTORY}
+
+sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \
+       -e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \
+       -e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
+               echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
+               exit 3
+       }
+
+echo "Localized ${FINAL_CONFIG_FILE} successfully."
+
+