From 32fbed2a84f2653b5e807e067ce60d3a33e3b78a Mon Sep 17 00:00:00 2001 From: ist Date: Tue, 21 Apr 2015 15:24:12 +0200 Subject: Download redland key with curl --- base-install | 4 +++- config.sh | 2 +- debian.list | 1 - ubuntu.list | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base-install b/base-install index 2882dcc..2764d42 100755 --- a/base-install +++ b/base-install @@ -20,7 +20,9 @@ echo "Base Packages:" echo echo "Updating index..." -cmd="$WGET -O redland_key.asc $REDLAND_APT_KEY >/dev/null 2>&1" && run_cmd "$cmd" "Download redland apt-key" +sudo $APT_GET install curl +check_utils "curl" +cmd="$CURL $REDLAND_APT_KEY > redland_key.asc >/dev/null 2>&1" && run_cmd "$cmd" "Download redland apt-key" cmd="sudo $APT_KEY add redland_key.asc >/dev/null 2>&1; rm redland_key.asc" && run_cmd "$cmd" "Adding redland apt-key" if ! cat "/etc/apt/sources.list" | grep "$REDLAND_DEB">/dev/null 2>&1; then echo "deb $REDLAND_DEB ./" | sudo $TEE -a /etc/apt/sources.list >/dev/null diff --git a/config.sh b/config.sh index b698ddf..d573bc8 100755 --- a/config.sh +++ b/config.sh @@ -24,7 +24,7 @@ RUBY_NUM_VER="2.0.0-p481" FOUR_STORE_VER="4store-v1.1.5" REDIS_URL="http://redis.googlecode.com/files" REDLAND_DWL="http://download.librdf.org" -REDLAND_APT_KEY="http://www.dajobe.org/gnupg.asc" +REDLAND_APT_KEY="https://www.dajobe.org/gnupg.asc" FOUR_STORE_URL="http://4store.org/download" # 4) Server settings. diff --git a/debian.list b/debian.list index 5420693..029c266 100644 --- a/debian.list +++ b/debian.list @@ -3,7 +3,6 @@ automake install avahi-daemon install build-essential install cmake install -curl install gnuplot install libavahi-glib-dev install libavahi-client-dev install diff --git a/ubuntu.list b/ubuntu.list index a9443a7..4fe9ca0 100644 --- a/ubuntu.list +++ b/ubuntu.list @@ -3,7 +3,6 @@ automake install avahi-daemon install build-essential install cmake install -curl install gnuplot install libavahi-glib-dev install libavahi-client-dev install -- cgit v1.2.3