[ARVADOS] updated: 8e76f934aefa26e2961db900d40ce8cec74bcbcd

[git at public.curoverse.com]

Summary of changes:
 docker/arvdock | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

       via  8e76f934aefa26e2961db900d40ce8cec74bcbcd (commit)
      from  9eaccd0367a1101ad9424eff21dff2f1138121b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8e76f934aefa26e2961db900d40ce8cec74bcbcd
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Apr 2 15:17:04 2015 -0400

    Make arvdock abort with a nice error message if docker or curl can not
    be found.
    
    refs #4752

diff --git a/docker/arvdock b/docker/arvdock
index 788c1b3..26eaba9 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -6,6 +6,8 @@ if [[ "$DOCKER" == "" ]]; then
     DOCKER=`which docker`
 fi
 
+CURL=`which curl`
+
 COMPUTE_COUNTER=0
 
 function usage {
@@ -312,7 +314,7 @@ EOF
         echo "******************************************************************"
         echo
     else
-        while ! curl -L -f http://workbench.dev.arvados >/dev/null 2>/dev/null ; do
+        while ! $CURL -L -f http://workbench.dev.arvados >/dev/null 2>/dev/null ; do
             echo "Waiting for Arvados to be ready."
             sleep 1
         done
@@ -464,6 +466,18 @@ function do_reset {
     done
 }
 
+if [ "$DOCKER" == '' ]
+then
+  echo "Docker not found. Please install it first."
+  exit 2
+fi
+
+if [ "$CURL" == '' ]
+then
+  echo "Curl not found. Please install it first."
+  exit 3
+fi
+
 if [ $# -lt 1 ]
 then
   usage

-----------------------------------------------------------------------


hooks/post-receive
--