Merge branch 'master' into 2919-provenance-graph-cutoff

[arvados.git] / docker / build.sh

diff --git a/docker/build.sh b/docker/build.sh
index add3194f52ab412dab965e621bdb24832ebec8f7..cbcc840667c4001365d5644be6fc4e1b16817d90 100755 (executable)
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,11 +1,14 @@
 #! /bin/bash
 
 # make sure Ruby 1.9.3 is installed before proceeding
-if ! ruby -v 2>/dev/null | grep '1\.9\.3' > /dev/null
+if ! ruby -e 'exit RUBY_VERSION >= "1.9.3"' 2>/dev/null
 then
-    echo "Installing Ruby. You may be required to enter your password."
+    echo "Installing Arvados requires at least Ruby 1.9.3."
+    echo "You may need to enter your password."
+    read -p "Press Ctrl-C to abort, or else press ENTER to install ruby1.9.3 and continue. " unused
+
     sudo apt-get update
     sudo apt-get -y install ruby1.9.3
 fi
 
-./build.rb $*
+build_tools/build.rb $*