From 196207631b9bee247420724fa5d1461a0f941698 Mon Sep 17 00:00:00 2001
From: Joubin Jabbari <joubin.j@gmail.com>
Date: Mon, 9 Apr 2018 16:17:45 -1000
Subject: [PATCH 1/2] Added instructions and script for easy installation under
 Ubuntu Tested with:

  * Ubuntu 16.04 LTS
  * Raspbian (Jesse, Pi 3 B+)
---
 linux-install.md | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 linux-install.sh | 14 +++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 linux-install.md
 create mode 100755 linux-install.sh

diff --git a/linux-install.md b/linux-install.md
new file mode 100644
index 0000000..ea57e08
--- /dev/null
+++ b/linux-install.md
@@ -0,0 +1,51 @@
+# Ubuntu Install
+> Tested on a clean install of `Ubuntu 16.04 LTS`
+
+## Intalling go
+Install `Go-Lang >= 1.7`
+
+```bash
+apt update
+apt install golang-1.10 -y
+```
+
+Add the newly install `go-lang` to the path
+
+```bash
+export PATH=$PATH:/usr/lib/go-1.10/bin
+```
+
+Test to make sure that you can execute `go`
+
+```bash
+go version
+```
+which should output something like
+
+```bash
+go version go1.10.1 linux/amd64
+```
+
+## Installing dns-over-https
+
+Clone this repo
+
+
+```bash
+git clone https://github.com/m13253/dns-over-https.git
+```
+
+Change directory to the cloned repo
+
+```bash
+cd dns-over-https
+```
+
+make and install
+
+```bash
+make && make install
+```
+
+
+
diff --git a/linux-install.sh b/linux-install.sh
new file mode 100755
index 0000000..c86ce46
--- /dev/null
+++ b/linux-install.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# See the linux-install.md (README) first. 
+
+sudo apt update
+sudo apt install golang-1.10 git -y
+export PATH=$PATH:/usr/lib/go-1.10/bin
+cd /tmp
+git clone https://github.com/m13253/dns-over-https.git
+cd dns-over-https
+make && sudo make install
+
+
+

From cdb8599c9f65ef81ec307ea71c9f1439cd12597f Mon Sep 17 00:00:00 2001
From: Joubin Jabbari <joubin.j@gmail.com>
Date: Thu, 12 Apr 2018 08:24:33 -1000
Subject: [PATCH 2/2] Made changes per pull request feedback #7.

---
 linux-install.md | 14 +++++++-------
 linux-install.sh |  7 +++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/linux-install.md b/linux-install.md
index ea57e08..c42ecfe 100644
--- a/linux-install.md
+++ b/linux-install.md
@@ -2,14 +2,14 @@
 > Tested on a clean install of `Ubuntu 16.04 LTS`
 
 ## Intalling go
-Install `Go-Lang >= 1.7`
+Install `Go >= 1.9`
 
 ```bash
-apt update
-apt install golang-1.10 -y
+sudo apt update
+sudo apt install golang-1.10 -y
 ```
 
-Add the newly install `go-lang` to the path
+Add the newly install `go` to the path
 
 ```bash
 export PATH=$PATH:/usr/lib/go-1.10/bin
@@ -44,8 +44,8 @@ cd dns-over-https
 make and install
 
 ```bash
-make && make install
-```
-
+make
+sudo make install
+```	
 
 
diff --git a/linux-install.sh b/linux-install.sh
index c86ce46..c5ccf34 100755
--- a/linux-install.sh
+++ b/linux-install.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # See the linux-install.md (README) first. 
+set -e 
 
 sudo apt update
 sudo apt install golang-1.10 git -y
@@ -8,7 +9,5 @@ export PATH=$PATH:/usr/lib/go-1.10/bin
 cd /tmp
 git clone https://github.com/m13253/dns-over-https.git
 cd dns-over-https
-make && sudo make install
-
-
-
+make 
+sudo make install
\ No newline at end of file