From 25c4b965eb9a4c327af91a2578f8a392c626f615 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Tue, 5 Nov 2019 07:25:48 +0000
Subject: [PATCH] Added install option for web root. Resolves #294

---
 installers/common.sh | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/installers/common.sh b/installers/common.sh
index ea4d18ef..e90823f2 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -76,7 +76,17 @@ function config_installation() {
     install_log "Configure installation"
     echo "Detected ${version_msg}" 
     echo "Install directory: ${raspap_dir}"
-    echo "Lighttpd directory: ${webroot_dir}"
+    echo -n "Install to Lighttpd root directory: ${webroot_dir}? [y/N]: "
+    if [ $assume_yes == 0 ]; then
+        read answer
+        if [[ $answer != "y" ]]; then
+            read -e -p "Enter alternate Lighttpd directory: " -i "/var/www/html/" webroot_dir
+        fi
+    else
+        echo -e
+    fi
+    echo "Install to Lighttpd directory: ${webroot_dir}"
+
     echo -n "Complete installation with these values? [y/N]: "
     if [ $assume_yes == 0 ]; then
         read answer
@@ -146,6 +156,10 @@ function create_hostapd_scripts() {
 
 # Fetches latest files from github to webroot
 function download_latest_files() {
+    if [ ! -d "$webroot_dir" ]; then
+        sudo mkdir -p $webroot_dir || install_error "Unable to create new webroot directory"
+    fi
+
     if [ -d "$webroot_dir" ]; then
         sudo mv $webroot_dir "$webroot_dir.`date +%F-%R`" || install_error "Unable to remove old webroot directory"
     fi
@@ -338,11 +352,11 @@ function optimize_php() {
     if [ $assume_yes == 0 ]; then
         read answer
         if [ "$answer" != 'n' ] && [ "$answer" != 'N' ]; then
-            $php_session_cookie=1;
+            php_session_cookie=1;
         fi
     fi
 
-    if [ $assume_yes == 1 ] || [ $php_session_cookie == 1 ]; then
+    if [ "$assume_yes" == 1 ] || [ "$php_session_cookie" == 1 ]; then
         echo "Php-cgi enabling session.cookie_httponly."
         sudo sed -i -E 's/^session\.cookie_httponly\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.cookie_httponly = 1/' "$phpcgiconf"
     fi
@@ -352,11 +366,11 @@ function optimize_php() {
         if [ $assume_yes == 0 ]; then
             read answer
             if [ "$answer" != 'n' ] && [ "$answer" != 'N' ]; then
-                $php_opcache=1;
+                php_opcache=1;
             fi
         fi
 
-        if [ $assume_yes == 1 ] || [ $phpopcache == 1 ]; then
+        if [ "$assume_yes" == 1 ] || [ "$phpopcache" == 1 ]; then
             echo -e "Php-cgi enabling opcache.enable."
             sudo sed -i -E 's/^;?opcache\.enable\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/opcache.enable = 1/' "$phpcgiconf"
             # Make sure opcache extension is turned on.