From 4aea5131a87f375285210d9ccde2470cfeac5876 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Sun, 3 Aug 2014 22:30:48 +0200 Subject: [PATCH] Be less presumptuous about the GNU/Linux distribution we are being run on, and do not try to install ruby >= 1.9.3 automatically. refs #3363 --- docker/build.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docker/build.sh b/docker/build.sh index c9fbf05ff6..77aeb1f187 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,14 +1,11 @@ #! /bin/bash -# make sure Ruby 1.9.3 is installed before proceeding +# make sure a Ruby version greater than or equal to 1.9.3 is installed before proceeding if ! ruby -e 'exit RUBY_VERSION >= "1.9.3"' 2>/dev/null then - 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 + echo "Building the Arvados docker containers requires at least Ruby 1.9.3." + echo "Please install ruby 1.9.3 or higher before executing this script." + exit 1 fi function usage { -- 2.30.2