From ea69af8853a2c47bd69180edfda6499422b35914 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Fri, 4 Nov 2016 18:30:50 -0700
Subject: [PATCH 1/6] Update Basic for path without space.

---
 automated install/basic-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 14d271ef..77d0dd9a 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -690,7 +690,7 @@ installScripts() {
     cd "${PI_HOLE_LOCAL_REPO}"
     install -o "${USER}" -Dm755 -t /opt/pihole/ gravity.sh
     install -o "${USER}" -Dm755 -t /opt/pihole/ ./advanced/Scripts/*.sh
-    install -o "${USER}" -Dm755 -t /opt/pihole/ ./automated\ install/uninstall.sh
+    install -o "${USER}" -Dm755 -t /opt/pihole/ ./automated_install/uninstall.sh
     install -o "${USER}" -Dm755 -t /usr/local/bin/ pihole
     install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
 	  echo " done."

From 0dc9d7fbd472d5b8e9ec20fb81de309a221b8328 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Fri, 4 Nov 2016 18:31:38 -0700
Subject: [PATCH 2/6] Remove swapfile that hasn't been used on about a year.

---
 advanced/dphys-swapfile | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 advanced/dphys-swapfile

diff --git a/advanced/dphys-swapfile b/advanced/dphys-swapfile
deleted file mode 100644
index d8225175..00000000
--- a/advanced/dphys-swapfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Pi-hole: A black hole for Internet advertisements
-# (c) 2015, 2016 by Jacob Salmela
-# Network-wide ad blocking via your Raspberry Pi
-# http://pi-hole.net
-# Swap file config
-#
-# Pi-hole is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-
-CONF_SWAPSIZE=500

From 1568c9ab3bc664f5b52ba48d7d257d8257d78b94 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Fri, 4 Nov 2016 18:32:10 -0700
Subject: [PATCH 3/6] Change path to remove space

---
 {automated install => automated_install}/basic-install.sh | 0
 {automated install => automated_install}/uninstall.sh     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {automated install => automated_install}/basic-install.sh (100%)
 mode change 100755 => 100644
 rename {automated install => automated_install}/uninstall.sh (100%)
 mode change 100755 => 100644

diff --git a/automated install/basic-install.sh b/automated_install/basic-install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from automated install/basic-install.sh
rename to automated_install/basic-install.sh
diff --git a/automated install/uninstall.sh b/automated_install/uninstall.sh
old mode 100755
new mode 100644
similarity index 100%
rename from automated install/uninstall.sh
rename to automated_install/uninstall.sh

From fe959b15b421ef7749e54be4247f7669ad902235 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Fri, 4 Nov 2016 18:43:54 -0700
Subject: [PATCH 4/6] Add git clone method to installers

---
 .idea/codeStyleSettings.xml |  3 +++
 README.md                   | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index a571e63f..1028340e 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -15,6 +15,9 @@
             <option name="USE_RELATIVE_INDENTS" value="false" />
           </value>
         </option>
+        <MarkdownNavigatorCodeStyleSettings>
+          <option name="RIGHT_MARGIN" value="72" />
+        </MarkdownNavigatorCodeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/README.md b/README.md
index e8c6e55c..5f7e56c9 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,24 @@ Works on most Debian and CentOS/RHEL based distributions!
 
 ### `curl -sSL https://install.pi-hole.net | bash`
 
-### Alternative Semi-Automated install
+### Alternative Semi-Automated Install Methods
 
+Clone our repository and run the automated installer from your device.
+
+```
+git clone --depth 1 https://github.com/pi-hole/pi-hole.git Pi-hole
+cd Pi-hole/automated_installer/
+(Optionally nano|vi|vim|cat the basic-install.sh file to verify the actions it will take)
+bash basic-install.sh
+```
+
+Or
+
+If you wish to read over the script before running it, then after the [`wget`](https://linux.die.net/man/1/wget) command, run `nano basic-install.sh` to open the file in a text viewer.
 ```bash
 wget -O basic-install.sh https://install.pi-hole.net
 bash basic-install.sh
 ```
-If you wish to read over the script before running it, then after the [`wget`](https://linux.die.net/man/1/wget) command, run `nano basic-install.sh` to open the file in a text viewer.
 
 Once installed, [configure your router to have **DHCP clients use the Pi as their DNS server**](http://pi-hole.net/faq/can-i-set-the-pi-hole-to-be-the-dns-server-at-my-router-so-i-dont-have-to-change-settings-for-my-devices/) and then any device that connects to your network will have ads blocked without any further configuration. Alternatively, you can manually set each device to [use the Raspberry Pi as its DNS server](http://pi-hole.net/faq/how-do-i-use-the-pi-hole-as-my-dns-server/).
 

From 941ba535ef30cc4f67cbff805192c64d9c5ebb94 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Fri, 4 Nov 2016 18:44:21 -0700
Subject: [PATCH 5/6] Remove CC badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f7e56c9..e73fdbc8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=3011939)](https://www.bountysource.com/trackers/3011939-pi-hole-pi-hole?utm_source=3011939&utm_medium=shield&utm_campaign=TRACKER_BADGE) [![Code Climate](https://codeclimate.com/github/pi-hole/pi-hole/badges/gpa.svg)](https://codeclimate.com/github/pi-hole/pi-hole) [![Build Status](https://travis-ci.org/pi-hole/pi-hole.svg?branch=development)](https://travis-ci.org/pi-hole/pi-hole)
+[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=3011939)](https://www.bountysource.com/trackers/3011939-pi-hole-pi-hole?utm_source=3011939&utm_medium=shield&utm_campaign=TRACKER_BADGE) [![Build Status](https://travis-ci.org/pi-hole/pi-hole.svg?branch=development)](https://travis-ci.org/pi-hole/pi-hole)
 
 # Automated Install
 

From 92d91f2c76bfd3aa4a23e681eac5327675dc1d84 Mon Sep 17 00:00:00 2001
From: diginc <adam@diginc.us>
Date: Sat, 5 Nov 2016 12:39:20 -0500
Subject: [PATCH 6/6] Update pathing in dockerfile

---
 test/centos.Dockerfile | 7 ++++---
 test/debian.Dockerfile | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/centos.Dockerfile b/test/centos.Dockerfile
index 9af7eb4d..08ec9bae 100644
--- a/test/centos.Dockerfile
+++ b/test/centos.Dockerfile
@@ -5,10 +5,11 @@ ENV SCRIPTDIR /opt/pihole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
-RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
+RUN cp $GITDIR/advanced/Scripts/*.sh \
+       $GITDIR/gravity.sh $GITDIR/pihole \
+       $GITDIR/automated_install/*.sh \
+       $SCRIPTDIR/
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
-
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
diff --git a/test/debian.Dockerfile b/test/debian.Dockerfile
index b80d6155..d82a58fe 100644
--- a/test/debian.Dockerfile
+++ b/test/debian.Dockerfile
@@ -5,11 +5,12 @@ ENV SCRIPTDIR /opt/pihole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
-RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
+RUN cp $GITDIR/advanced/Scripts/*.sh \
+       $GITDIR/gravity.sh $GITDIR/pihole \
+       $GITDIR/automated_install/*.sh \
+       $SCRIPTDIR/
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
 
 
 RUN true && \
     chmod +x $SCRIPTDIR/*
-
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \