improves the utility scripts.

[metasearch/grid-chef-repo.git] / cookbooks / concourse-ci / templates / default / opt / docker-compose / app / concourse / bin / concourse_start

diff --git a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_start b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_start
index dfbef3c..b2a17c4 100644 (file)
--- a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_start
+++ b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_start
@@ -1,17 +1,23 @@
-#!/bin/sh\r
-\r
-PATH=/usr/bin:/bin:/usr/local/bin\r
-\r
-if [ `whoami` != 'root' ]; then\r
-  echo 'ERROR: This script requires the root privilege.' >&2\r
-  exit 1\r
-fi\r
-\r
-echo `date '+%Y-%m-%d %H:%M:%S %z'`' Starting Concourse ...'\r
-\r
-cd <%= node['concourse-ci']['docker-compose']['app_dir'] %> && \\r
-docker-compose down && \\r
-docker-compose up -d && \\r
-./bin/fly_prune_workers_main\r
-\r
-echo `date '+%Y-%m-%d %H:%M:%S %z'`' Started Concourse.'\r
+#!/bin/sh
+
+PATH=/usr/bin:/bin:/usr/local/bin
+OPTS=''
+
+if [ `whoami` != 'root' ]; then
+  echo 'ERROR: This script requires the root privilege.' >&2
+  exit 1
+fi
+
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' Starting Concourse ...'
+  OPTS='--no-ansi'
+fi
+
+cd <%= node['concourse-ci']['docker-compose']['app_dir'] %> && \
+docker-compose $OPTS down && \
+docker-compose $OPTS up -d && \
+./bin/fly_prune_workers_main
+
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' Started Concourse.'
+fi