From 96011bc2ae615a6c8b947e9c6111443e110ebafc Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Wed, 20 Jan 2016 22:02:54 +0000
Subject: [PATCH] make InstallWebAdmin() a bit more intelligent, and less
 verbose. Checks if installing over an existing installation, and if so, will
 remove existing webadmin folder.

---
 automated install/basic-install.sh | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index fb47bd10..e2a7fdd4 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -252,13 +252,29 @@ $SUDO apt-get -y install git
 }
 
 installWebAdmin(){
-$SUDO wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip
+if [ -d "/var/www/html/admin" ]; then	
+  $SUDO rm -rf /var/www/html/admin
+fi
+if [ -d "/var/www/html/AdminLTE-master" ]; then
+  $SUDO rm -rf /var/www/html/AdminLTE-master
+fi
+$SUDO echo ":::Downloading and installing latest WebAdmin files..."
+$SUDO wget -nv https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip
 $SUDO unzip -oq /var/www/master.zip -d /var/www/html/
 $SUDO mv /var/www/html/AdminLTE-master /var/www/html/admin
 $SUDO rm /var/www/master.zip 2>/dev/null
-$SUDO touch /var/log/pihole.log
-$SUDO chmod 644 /var/log/pihole.log
-$SUDO chown dnsmasq:root /var/log/pihole.log
+$SUDO echo ":::...Done."
+
+$SUDO echo ":::Creating log file and changing owner to dnsmasq..."
+if [ ! -f /var/log/pihole.log ]; then		
+    $SUDO touch /var/log/pihole.log
+		$SUDO chmod 644 /var/log/pihole.log
+		$SUDO chown dnsmasq:root /var/log/pihole.log
+		$SUDO echo ":::...Done."
+else
+	  $SUDO echo ":::No need to create, already exists!"
+fi
+
 }
 
 installPiholeWeb(){