From 8f86b556c7446c4d48291c3de4fe74b9313e0d13 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Tue, 26 Jan 2016 16:50:43 +0000
Subject: [PATCH] Include letsencrypt within trove

---
 src/freedombone         | 3 +++
 src/freedombone-addcert | 4 ++--
 src/freedombone-client  | 2 +-
 src/freedombone-mesh    | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 1a595bd8..54da5d4b 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -95,6 +95,9 @@ FRIENDS_TROVE_PASSWORD=
 FRIENDS_TROVE_SERVER=
 FRIENDS_TROVE_SSH_PORT=2222
 
+# This isn't used here, but is included for trove creation purposes
+LETSENCRYPT_REPO="https://github.com/letsencrypt/letsencrypt"
+
 # An optional password to log into IRC. This applies to all users
 IRC_PASSWORD=
 
diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index 9abc1621..3d211723 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -48,7 +48,7 @@ NODH=
 DH_KEYLENGTH=2048
 INSTALL_DIR=/root/build
 LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
-LETSENCRYPT_REPO='https://github.com/letsencrypt/letsencrypt'
+LETSENCRYPT_REPO="https://github.com/letsencrypt/letsencrypt"
 MY_EMAIL_ADDRESS=
 
 function show_help {
@@ -184,7 +184,7 @@ function add_cert_letsencrypt {
 
     # obtain the repo
     if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
-        git clone $LETSENCRYPT_REPO
+        git clone $LETSENCRYPT_REPO ${INSTALL_DIR}/letsencrypt
         if [ ! -d ${INSTALL_DIR}/letsencrypt ]; then
             exit 76283
         fi
diff --git a/src/freedombone-client b/src/freedombone-client
index cb40c17c..9784723e 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -130,7 +130,7 @@ function mesh_babel {
               mkdir ~/develop
           fi
           cd ~/develop
-          git clone $TOXID_REPO
+          git clone $TOXID_REPO ~/develop/toxid
       fi
       cd ~/develop/toxid
       sudo make install
diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index a9d0b3e1..33e93a51 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -65,7 +65,7 @@ function install_toxcore {
         mkdir ~/develop
     fi
     cd ~/develop
-    git clone $TOXCORE_REPO
+    git clone $TOXCORE_REPO ~/develop/toxcore
     cd ~/develop/toxcore
     autoreconf -i
     ./configure --enable-daemon
@@ -144,7 +144,7 @@ function install_toxid {
         return
     fi
     cd ~/develop
-    git clone $TOXID_REPO
+    git clone $TOXID_REPO ~/develop/toxid
     cd ~/develop/toxid
     make
     sudo make install