From f17b7996386f4f6db018410ae08added77676ac1 Mon Sep 17 00:00:00 2001
From: 3onyc <3onyc@x3tech.com>
Date: Fri, 22 May 2015 08:47:14 +0200
Subject: [PATCH 1/2] Ensure curl is installed by bootstrap.sh if it's missing

---
 bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index 488ab4fad..8425170ad 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -15,6 +15,7 @@ if ! command -v apt-get &>/dev/null; then
 fi
 
 apt-get update
+which curl > /dev/null || apt-get install -qq -y curl
 [[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties
 
 dokku_install_source() {

From 450f9f19b29d0a47d1c8b140d14f52a613f4b0f0 Mon Sep 17 00:00:00 2001
From: 3onyc <3onyc@x3tech.com>
Date: Fri, 22 May 2015 08:49:09 +0200
Subject: [PATCH 2/2] Make curl follow redirects, and don't suppress its output
 in bootstrap.sh

---
 bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 8425170ad..66e3a7d2b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,8 +32,8 @@ dokku_install_source() {
 }
 
 dokku_install_package() {
-  curl --silent https://get.docker.io/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
-  curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
+  curl -sSL https://get.docker.io/gpg | apt-key add -
+  curl -sSL https://packagecloud.io/gpg.key | apt-key add -
 
   echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
   echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list