diff prod/import-usas.sh @ 244:fa23b6f5bb58 hotfix/v2.0.1

DEP-14: fix line endings
author smith@nwoca.org
date Thu, 11 Jan 2018 18:32:09 +0000
parents fa943a14123d
children
line wrap: on
line diff
--- a/prod/import-usas.sh	Thu Jan 11 18:26:24 2018 +0000
+++ b/prod/import-usas.sh	Thu Jan 11 18:32:09 2018 +0000
@@ -1,23 +1,23 @@
-#!/bin/bash
-
-source "$( dirname "${BASH_SOURCE[0]}")/../scripts/.functions.sh"
-
-docker-compose stop usasapp usasdb
-resetDbVolume usasdb
-docker-compose rm -vf usasapp usasdb
-
-export IMP_IRN=${IMP_IRN}
-export IMP_URL=${IMP_URL-ftp://username:password@nwoca.org}
-export IMP_PATH=${IMP_PATH}
-
-[ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
- [ -f "docker-compose.usasimport.override.yml" ] && export OVERRIDE2=" -f docker-compose.usasimport.override.yml"
-#
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport 
-# start import and wait for completion
- docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE $OVERRIDE2 up usasimport | tee usasimport.log
-# remove temporary container
-docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport
-# start application
-docker-compose up -d usasapp
-
+#!/bin/bash
+
+source "$( dirname "${BASH_SOURCE[0]}")/../scripts/.functions.sh"
+
+docker-compose stop usasapp usasdb
+resetDbVolume usasdb
+docker-compose rm -vf usasapp usasdb
+
+export IMP_IRN=${IMP_IRN}
+export IMP_URL=${IMP_URL-ftp://username:password@nwoca.org}
+export IMP_PATH=${IMP_PATH}
+
+[ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
+ [ -f "docker-compose.usasimport.override.yml" ] && export OVERRIDE2=" -f docker-compose.usasimport.override.yml"
+#
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport 
+# start import and wait for completion
+ docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE $OVERRIDE2 up usasimport | tee usasimport.log
+# remove temporary container
+docker-compose -f docker-compose.yml -f ${SSDT_HOME}/prod/import-usas.yml $OVERRIDE rm -f usasimport
+# start application
+docker-compose up -d usasapp
+