From 5202185bf86a565173e841d86131d7518ebdaba7 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 4 Feb 2016 18:52:33 +0100 Subject: [PATCH] Fix setup on docker 14.04 instances. --- install-deps.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 6ae6ed2e5..77157c3e1 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -386,7 +386,6 @@ function run_installer() if [[ $(ldconfig -v 2>/dev/null | grep rocksdb | wc -l) == 1 ]]; then depFound=$((depFound+1)) check "apt-get" - echo "$($APT_PATH -v)" isRocksDB=true else uncheck "librocksdb is missing" @@ -431,7 +430,6 @@ function run_installer() then depFound=$((depFound+1)) check "apt-get" - echo "$($APT_PATH -v)" isApt=true else uncheck "apt-get is missing" @@ -499,7 +497,7 @@ function run_installer() function find_curl() { depCount=$((depCount+1)) - MAKE_PATH=`which curl 2>/dev/null` + CURL_PATH=`which curl 2>/dev/null` if [[ -f $CURL_PATH ]] then @@ -515,10 +513,12 @@ function run_installer() function ubuntu1404_rocksdb_installer() { - sudo add-apt-repository -y ppa:giskou/librocksdb + sudo apt-get update -qq + sudo apt-get install -qq -y software-properties-common + sudo apt-add-repository -y ppa:giskou/librocksdb sudo apt-get -f -y install sudo apt-get update -qq - sudo apt-get install -y librocksdb + sudo apt-get install -qq -y librocksdb } function linux_rocksdb_installer()