From f2db64be898cd0860338455bde8479e8258887af Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 5 Nov 2016 18:22:45 +0000
Subject: [PATCH] Use jessie script from repo

---
 src/freedombone-image | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/freedombone-image b/src/freedombone-image
index 3ed93a8e..3740e618 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -35,12 +35,19 @@ PROJECT_NAME='freedombone'
 export TEXTDOMAIN=${PROJECT_NAME}-image
 export TEXTDOMAINDIR="/usr/share/locale"
 
+PROJECT_INSTALL_DIR=/usr/local/bin
+if [ -f /usr/bin/${PROJECT_NAME} ]; then
+    PROJECT_INSTALL_DIR=/usr/bin
+fi
+
+source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
+
 #get the project repo
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
 for f in $UTILS_FILES
 do
-  source $f
+    source $f
 done
 read_config_param PROJECT_REPO
 
@@ -176,20 +183,11 @@ function image_setup {
             fi
             sudo pacman -S --noconfirm device-mapper libaio liburcu fakeroot
             cd ~/develop/multipath-tools
-            makepkg
-            makepkg -i
-            cd ~/develop
-            if [ ! -f ~/develop/debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz ]; then
-                wget http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz
+            makepkg --force --noconfirm
+            makepkg -i --force --noconfirm
+            if [ ! -f /usr/share/debootstrap/scripts/${DEBIAN_VERSION} ]; then
+                sudo wget https://raw.githubusercontent.com/bashrc/freedombone/stockholm/image_build/debootstrap/scripts/${DEBIAN_VERSION} /usr/share/debootstrap/scripts/${DEBIAN_VERSION}
             fi
-            if [ ! -f ~/develop/debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz ]; then
-                echo $'Failed to download debootstrap code'
-                return
-            fi
-            if [ ! -d ~/develop/debootstrap/scripts ]; then
-                tar -xzvf debootstrap_${DEBOOTSTRAP_VERSION}.tar.gz
-            fi
-            sudo mv ~/develop/debootstrap/scripts/* /usr/share/debootstrap/scripts
             ;;
         *)
             echo $'Unkown operating system'