[incubator-openwhisk-devtools] branch master updated: Update setup.sh to test for existing binary. (#44)

[dr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dragos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d48cc2  Update setup.sh to test for existing binary. (#44)
2d48cc2 is described below

commit 2d48cc26ecf28872478dcec6a53fcdb61702e625
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Fri Jul 7 09:27:04 2017 -0500

    Update setup.sh to test for existing binary. (#44)
---
 docker-compose/.travis/setup.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/docker-compose/.travis/setup.sh b/docker-compose/.travis/setup.sh
index 57fcbb2..4fd7aeb 100755
--- a/docker-compose/.travis/setup.sh
+++ b/docker-compose/.travis/setup.sh
@@ -1,14 +1,22 @@
-# This script assumes Docker is already installed
-# see tools/travis/setup.sh
 #!/bin/bash
+set -x -e
+uname -sm
+
+DOCKER_COMPOSE="docker-compose"
+DOCKER_COMPOSE_TMP="$DOCKER_COMPOSE.bin"
 
 version_exists=`(docker-compose --version | grep ${DOCKER_COMPOSE_VERSION}) || echo "false"`
+
+# This script assumes Docker is already installed
+# Trusty for Travis SHOULD include latest docker compose (e.g., 1.13.0)
 if [ "${version_exists}" == "false" ]
 then
     echo "Installing Docker Compose ${DOCKER_COMPOSE_VERSION}"
-    sudo rm /usr/local/bin/docker-compose
-    curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose.bin
-    chmod +x docker-compose.bin
-    sudo mv docker-compose.bin /usr/local/bin/docker-compose
+    if [ -f /usr/local/bin/$DOCKER_COMPOSE ]; then
+        sudo rm /usr/local/bin/$DOCKER_COMPOSE
+    fi
+    curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > $DOCKER_COMPOSE_TMP
+    chmod +x $DOCKER_COMPOSE_TMP
+    sudo mv $DOCKER_COMPOSE_TMP /usr/local/bin/$DOCKER_COMPOSE
 fi
 echo "Docker Compose Version:" `docker-compose --version`

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].