From eb21b2bac8c2648e71ae123ad2965d22f2b69b72 Mon Sep 17 00:00:00 2001
From: Thomas Malkewitz <thomas.malkewitz@gmail.com>
Date: Sun, 19 Nov 2017 10:51:51 -0500
Subject: [PATCH 1/4] Removed php5 dependencies per issue #39

Removed the php5 dependencies that was suggested in #39.  The script now runs fine, however, the website is still unavailable after it completes.
---
 install.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index f80324f..cb683e7 100755
--- a/install.sh
+++ b/install.sh
@@ -47,8 +47,7 @@ warn() {
 die () {
   local st="$?"
   warn "$@"
-  exit "$st"
-}
+  exit "$st"}
 
 ############
 ### Create install log file
@@ -92,7 +91,7 @@ if [ $(($nowTime - $lastUpdate)) -gt 604800 ] ; then
     echo "last apt-get update was over a week ago. Running apt-get update before updating dependencies"
     sudo apt-get update||die
 fi
-sudo apt-get install -y apache2 libapache2-mod-php5 php5-cli php5-common php5-cgi php5 git-core build-essential python-dev python-pip pastebinit || die
+sudo apt-get install -y apache2 libapache2-mod-php php-cli php-common php-cgi php git-core build-essential python-dev python-pip pastebinit || die
 echo -e "\n***** Installing/updating required python packages via pip... *****\n"
 sudo pip install pyserial psutil simplejson configobj gitpython --upgrade
 echo -e "\n***** Done processing BrewPi dependencies *****\n"

From 0217efc79b5b5e8c4212dac0043b3f7979915cc0 Mon Sep 17 00:00:00 2001
From: Thomas Malkewitz <thomas.malkewitz@gmail.com>
Date: Sun, 19 Nov 2017 12:53:03 -0500
Subject: [PATCH 2/4] Added missing dependancy, php7.0-mbstring

There was a missing dependency, `php7.0-mbstring` that was causing the `/index.php` to not display, and throwing an error in the `/var/log/apache2/error.log`:

```
PHP Fatal error:  Uncaught Error: Call to undefined function mb_convert_encoding() in /var/www/html/index.php:53\nStack trace:\n#0 /var/www/html/index.php(24): prepareJSON('{"beerName": "S...')\n#1 {main}\n  thrown in /var/www/html/index.php on line 53
```
---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index cb683e7..814e974 100755
--- a/install.sh
+++ b/install.sh
@@ -57,7 +57,7 @@ exec 2>&1
 
 ############
 ### Check for network connection
-###########
+ ###########
 echo -e "\nChecking for Internet connection..."
 ping -c 3 github.com &> /dev/null
 if [ $? -ne 0 ]; then
@@ -91,7 +91,7 @@ if [ $(($nowTime - $lastUpdate)) -gt 604800 ] ; then
     echo "last apt-get update was over a week ago. Running apt-get update before updating dependencies"
     sudo apt-get update||die
 fi
-sudo apt-get install -y apache2 libapache2-mod-php php-cli php-common php-cgi php git-core build-essential python-dev python-pip pastebinit || die
+sudo apt-get install -y apache2 libapache2-mod-php php-cli php-common php-cgi php git-core build-essential python-dev python-pip pastebinit php7.0-mbstring || die
 echo -e "\n***** Installing/updating required python packages via pip... *****\n"
 sudo pip install pyserial psutil simplejson configobj gitpython --upgrade
 echo -e "\n***** Done processing BrewPi dependencies *****\n"

From 855b544ef3652eb7827a61139bb69baada1f1785 Mon Sep 17 00:00:00 2001
From: Thomas Malkewitz <dotps1@outlook.com>
Date: Sun, 19 Nov 2017 12:57:35 -0500
Subject: [PATCH 3/4] Fix spacing issue from editing in the browser.

---
 install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 814e974..fa0a5b5 100755
--- a/install.sh
+++ b/install.sh
@@ -47,7 +47,8 @@ warn() {
 die () {
   local st="$?"
   warn "$@"
-  exit "$st"}
+  exit "$st"
+}
 
 ############
 ### Create install log file
@@ -57,7 +58,7 @@ exec 2>&1
 
 ############
 ### Check for network connection
- ###########
+###########
 echo -e "\nChecking for Internet connection..."
 ping -c 3 github.com &> /dev/null
 if [ $? -ne 0 ]; then

From dae076b03076ff69f10b04faea7525f0c3cb8cef Mon Sep 17 00:00:00 2001
From: Thomas Malkewitz <dotps1@outlook.com>
Date: Sun, 26 Nov 2017 10:13:36 -0500
Subject: [PATCH 4/4] Adding missing python-configobj dependancy.

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

diff --git a/install.sh b/install.sh
index fa0a5b5..8313612 100755
--- a/install.sh
+++ b/install.sh
@@ -92,7 +92,7 @@ if [ $(($nowTime - $lastUpdate)) -gt 604800 ] ; then
     echo "last apt-get update was over a week ago. Running apt-get update before updating dependencies"
     sudo apt-get update||die
 fi
-sudo apt-get install -y apache2 libapache2-mod-php php-cli php-common php-cgi php git-core build-essential python-dev python-pip pastebinit php7.0-mbstring || die
+sudo apt-get install -y apache2 libapache2-mod-php php-cli php-common php-cgi php git-core build-essential python-dev python-pip pastebinit php7.0-mbstring python-configobj || die
 echo -e "\n***** Installing/updating required python packages via pip... *****\n"
 sudo pip install pyserial psutil simplejson configobj gitpython --upgrade
 echo -e "\n***** Done processing BrewPi dependencies *****\n"