From 8b8addd807e135911ee3b15b9323b4e78a543a20 Mon Sep 17 00:00:00 2001 From: jimmydot Date: Mon, 8 May 2017 18:00:46 -0400 Subject: [VID-6] Strip carriage returns from scripts Change-Id: I96e3eaaf48c7bd4d98a9fdcc1f5d6f9ec489302d Signed-off-by: jimmydot --- deliveries/src/main/scripts/localize.sh | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'deliveries/src/main/scripts/localize.sh') diff --git a/deliveries/src/main/scripts/localize.sh b/deliveries/src/main/scripts/localize.sh index e72d622b4..3966f7023 100755 --- a/deliveries/src/main/scripts/localize.sh +++ b/deliveries/src/main/scripts/localize.sh @@ -1,18 +1,18 @@ -#!/bin/bash - -#Extract the WAR so it can be customized by the localization script -cd /tmp/vid/stage -jar -xf vid.war - -source /tmp/vid/localize_war.sh || { - echo "ERROR: Localization script failed" - exit 2 -} - -#Create the customized WAR and deploy it to Tomcat -mkdir -p /tmp/vid/deployed -cd /tmp/vid/stage -jar -cvf /tmp/vid/deployed/vid.war . -cd -mv -f /tmp/vid/deployed/vid.war /usr/local/tomcat/webapps -catalina.sh run +#!/bin/bash + +#Extract the WAR so it can be customized by the localization script +cd /tmp/vid/stage +jar -xf vid.war + +source /tmp/vid/localize_war.sh || { + echo "ERROR: Localization script failed" + exit 2 +} + +#Create the customized WAR and deploy it to Tomcat +mkdir -p /tmp/vid/deployed +cd /tmp/vid/stage +jar -cvf /tmp/vid/deployed/vid.war . +cd +mv -f /tmp/vid/deployed/vid.war /usr/local/tomcat/webapps +catalina.sh run -- cgit 1.2.3-korg