From 3aa58a0e9f07946ff9df01b19d281c4f30c75103 Mon Sep 17 00:00:00 2001
From: whitestar <whitestar@users.osdn.me>
Date: Sun, 6 May 2018 12:15:35 +0900
Subject: [PATCH] improves the utility scripts.

---
 cookbooks/concourse-ci/CHANGELOG.md                |  4 +++
 .../app/concourse/bin/concourse_import_ca          | 24 ++++++-------
 .../app/concourse/bin/concourse_start              | 40 +++++++++++++---------
 .../docker-compose/app/concourse/bin/concourse_up  | 16 ++++-----
 .../app/concourse/bin/fly_prune_workers_main       | 15 ++++----
 cookbooks/concourse-ci/version                     |  2 +-
 6 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/cookbooks/concourse-ci/CHANGELOG.md b/cookbooks/concourse-ci/CHANGELOG.md
index 134446e..4a418ea 100644
--- a/cookbooks/concourse-ci/CHANGELOG.md
+++ b/cookbooks/concourse-ci/CHANGELOG.md
@@ -1,6 +1,10 @@
 concourse-ci CHANGELOG
 ======================
 
+0.2.9
+-----
+- improves the utility scripts.
+
 0.2.8
 -----
 - adds the `concourse_start` script.
diff --git a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_import_ca b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_import_ca
index 6466110..671eab1 100644
--- a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_import_ca
+++ b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_import_ca
@@ -1,12 +1,12 @@
-#!/bin/sh
-
-<%
-node['concourse-ci']['ssl_cert']['ca_names'].each {|ca_name|
--%>
-if ! cat /etc/ca-certificates.conf | grep <%= ca_name %>; then
-  echo <%= ca_name %>.crt >> /etc/ca-certificates.conf
-fi
-<%
-}
--%>
-update-ca-certificates
+#!/bin/sh
+
+<%
+node['concourse-ci']['ssl_cert']['ca_names'].each {|ca_name|
+-%>
+if ! cat /etc/ca-certificates.conf | grep <%= ca_name %>; then
+  echo <%= ca_name %>.crt >> /etc/ca-certificates.conf
+fi
+<%
+}
+-%>
+update-ca-certificates
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
--- 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
-
-PATH=/usr/bin:/bin:/usr/local/bin
-
-if [ `whoami` != 'root' ]; then
-  echo 'ERROR: This script requires the root privilege.' >&2
-  exit 1
-fi
-
-echo `date '+%Y-%m-%d %H:%M:%S %z'`' Starting Concourse ...'
-
-cd <%= node['concourse-ci']['docker-compose']['app_dir'] %> && \
-docker-compose down && \
-docker-compose up -d && \
-./bin/fly_prune_workers_main
-
-echo `date '+%Y-%m-%d %H:%M:%S %z'`' Started Concourse.'
+#!/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
diff --git a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_up b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_up
index 6921892..3a10e88 100644
--- a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_up
+++ b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/concourse_up
@@ -1,8 +1,8 @@
-#!/bin/sh
-# DEPRECATED: use `sudo docker-compose up` instead.
-
-cd <%= node['concourse-ci']['docker-compose']['app_dir']  %>
-sudo docker-compose up -d
-<% if node['concourse-ci']['docker-compose']['import_ca'] %>
-sudo docker exec $(sudo docker ps | grep "concourse_concourse-web" | awk '{print $1}') concourse_import_ca
-<% end %>
+#!/bin/sh
+# DEPRECATED: use `sudo docker-compose up` instead.
+
+cd <%= node['concourse-ci']['docker-compose']['app_dir']  %>
+sudo docker-compose up -d
+<% if node['concourse-ci']['docker-compose']['import_ca'] %>
+sudo docker exec $(sudo docker ps | grep "concourse_concourse-web" | awk '{print $1}') concourse_import_ca
+<% end %>
diff --git a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main
index 6d0e3ab..192979b 100644
--- a/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main
+++ b/cookbooks/concourse-ci/templates/default/opt/docker-compose/app/concourse/bin/fly_prune_workers_main
@@ -5,7 +5,9 @@ PATH=.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:`dirname $0`
 MAX_RETRY=10
 RETRY_INTERVAL=10
 
-echo `date '+%Y-%m-%d %H:%M:%S %z'`' fly prune-workers ...'
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' fly prune-workers ...'
+fi
 
 if [ `whoami` != 'root' ]; then
   echo 'ERROR: This script requires the root privilege.' >&2
@@ -17,17 +19,16 @@ fi
 for num in `seq 0 ${MAX_RETRY}`; do
   if [ $num != 0 ]; then
     echo "Retrying ${num}/${MAX_RETRY}..."
+    sleep ${RETRY_INTERVAL}s
   fi
   fly login -t main -u <%= @basic_auth_username %> -p $CONCOURSE_BASIC_AUTH_PASSWORD -c <%= @external_url %>
 
   if [ $? -eq 0 ]; then
     break
-  else
-    if [ $num = $MAX_RETRY ]; then
-      echo 'ERROR: Concourse server connection refused.' >&2 
-      exit 1
-    fi
-    sleep ${RETRY_INTERVAL}s
+  fi
+  if [ $num = $MAX_RETRY ]; then
+    echo 'ERROR: Concourse server connection refused.' >&2 
+    exit 1
   fi
 done
 
diff --git a/cookbooks/concourse-ci/version b/cookbooks/concourse-ci/version
index a45be46..1866a36 100644
--- a/cookbooks/concourse-ci/version
+++ b/cookbooks/concourse-ci/version
@@ -1 +1 @@
-0.2.8
+0.2.9
-- 
2.11.0