From 1fc061545275d1372b589946439ddd31a7e0fc41 Mon Sep 17 00:00:00 2001
From: Lawrence <sirlagz@gmail.com>
Date: Wed, 4 Oct 2017 01:28:57 +0800
Subject: [PATCH] Updated install script with new sudoers lines required.
 Updated uninstall script to resolve lighttpd directory contents not being
 removed Updated dashboard.php file to remove IP addresses when taking wlan0
 down.

---
 includes/dashboard.php  | 1 +
 installers/common.sh    | 1 +
 installers/uninstall.sh | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/dashboard.php b/includes/dashboard.php
index eb090a94..1f66542a 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -68,6 +68,7 @@ function DisplayDashboard(){
     exec( 'ifconfig wlan0 | grep -i running | wc -l',$test );
     if($test[0] == 0) {
       exec( 'sudo ip link set wlan0 up',$return );
+      exec( 'sudo ip -s a f label wlan0',$return);
     } else {
       echo 'Interface already up';
     }
diff --git a/installers/common.sh b/installers/common.sh
index d21a753b..93e82b54 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -185,6 +185,7 @@ function patch_system_files() {
       '/sbin/reboot'
       '/sbin/ip link set wlan0 down'
       '/sbin/ip link set wlan0 up'
+      '/sbin/ip -s a f label wlan0'
     )
 
     # Check if sudoers needs patchin
diff --git a/installers/uninstall.sh b/installers/uninstall.sh
index 6e2dd658..b63ab2f0 100644
--- a/installers/uninstall.sh
+++ b/installers/uninstall.sh
@@ -81,7 +81,7 @@ function remove_raspap_directories() {
         install_error "RaspAP Installation directory not found. Exiting!"
     fi
 
-    sudo rm -rf "$webroot_dir/*"
+    sudo rm -rf "$webroot_dir"/*
     sudo rm -rf "$raspap_dir"
 
 }