commit 2d48cc26ecf28872478dcec6a53fcdb61702e625
author Matt Rutkowski <mrutkows@us.ibm.com> Fri Jul 07 09:27:04 2017 -0500
committer ddragosd <ddragosd@gmail.com> Fri Jul 07 10:27:04 2017 -0400
tree 6079ef7a51524f4a30e5ef03a517cd24155fe093
parent 8226ced721eb93ac02e0b38225d109449b363e11

Update setup.sh to test for existing binary. (#44)

docker-compose/.travis/setup.sh

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`