new scripts and sort /etc

usr/local/bin/generator

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "Would you like to enable or disable the Static Generator Script?"
+    select stagen in "Enable" "Disable"; do
+        case $stagen in
+            Enable ) sudo a2ensite 000-upload.conf > /dev/null;
+	    sudo systemctl reload apache2;
+            echo "Static Generator Script enabled, access it by adding :81 to your Rpi IP in your browser";
+    	    sudo chown -R pi:pi /home/pi
+            sudo chown -R www-data:www-data /var/www/;
+            sudo chmod -R 775 /var/www;
+	break;;
+            Disable ) sudo a2dissite 000-upload.conf > /dev/null;
+	    sudo systemctl reload apache2;
+	    echo "Static Generator Script disabled";
+            sudo chown -R pi:pi /home/pi
+            sudo chown -R www-data:www-data /var/www/;
+            sudo chmod -R 775 /var/www;
+	break;;
+        esac
+    done
+exit 0

usr/local/bin/hotglue

@@ -1,25 +1,32 @@
 #!/bin/bash
-FILE=/home/pi/pivilion/hotglue/hotglue-latest-dev.zip
+echo "Would you like to install or restore Hotglue? Installing will overwrite any existing files in /var/www/html/pivilion/gen"
-if [ -f "$FILE" ]; then
+    select sres in "Install" "Restore"; do
-    echo "Hotglue already installed, restoring installation."
+        case $sres in 
-    sudo zip /home/pi/pivilion/hotglue/gen.backup.zip /var/www/html/pivilion/gen
+            Install ) wget https://hotglue.org/download/hotglue-latest-dev.zip -P /home/pi/pivilion/hotglue/;
-    sudo rm -rf /var/www/html/gen/{,.[!.],..?}*
+            unzip /home/pi/pivilion/hotglue/hotglue-latest-dev.zip  -d /home/pi/pivilion/hotglue/;
-    sudo cp -rT /home/pi/pivilion/hotglue /var/www/html/pivilion/gen
+            sudo mv /home/pi/pivilion/hotglue/k0a1a-*/* /home/pi/pivilion/hotglue/;
-    sudo chmod 777 /var/www/html/pivilion/gen/content
+            echo "Enter Hotglue admin user";
-else
+            read user;
-    wget https://hotglue.org/download/hotglue-latest-dev.zip -P /home/pi/pivilion/hotglue/
+            echo "Enter Hotglue admin password";
-    unzip /home/pi/pivilion/hotglue/hotglue-latest-dev.zip  -d /home/pi/pivilion/hotglue/
+            read password;
-    sudo mv /home/pi/pivilion/hotglue/k0a1a-hotglue2-ff69c8d/{,.[!.],..?}* /home/pi/pivilion/hotglue/
-    echo "Enter admin user"
-    read user
-    echo "Enter password"
-    read password
             echo -e "<?php\n@define('AUTH_USER', '$user');\n@define('AUTH_PASSWORD', '$password');" > /home/pi/pivilion/hotglue/user-config.inc.php
-    sudo mv /home/pi/pivilion/hotglue/htaccess-dist /home/pi/pivilion/hotglue/.htaccess
+            sudo mv /home/pi/pivilion/hotglue/htaccess-dist /home/pi/pivilion/hotglue/.htaccess;
-    sudo zip /home/pi/pivilion/hotglue/gen.backup.zip /var/www/html/pivilion/gen
+            sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}*;
-    sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}*
+            sudo cp -rT /home/pi/pivilion/hotglue /var/www/html/pivilion/gen;
-    sudo cp -rT /home/pi/pivilion/hotglue /var/www/html/pivilion/gen
+            sudo chmod 777 /var/www/html/pivilion/gen/content;
-    sudo chmod 777 /var/www/html/pivilion/gen/content
+            sudo chown -R pi:pi /home/pi; 
-fi
+	    sudo chown -R www-data:www-data /var/www/; 
-
+            sudo chmod -R 775 /var/www;
+            break;;
+            Restore ) sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}*;
+            sudo cp -aR /home/pi/pivilion/hotglue/backup /var/www/html/pivilion/gen;
+	    sudo mv /var/www/html/pivilion/gen/backup/* /var/www/html/pivilion/gen
+            sudo chmod -R 777 /var/www/html/pivilion/gen/content;
+	    sudo chown -R pi:pi /home/pi;
+	    sudo chown -R www-data:www-data /var/www/;
+            sudo chmod -R 775 /var/www;
+            break;;
+        esac
+    done
 exit 0 
+

usr/local/bin/hotspot

@@ -5,11 +5,12 @@ if [ $(dpkg-query -W -f='${Status}' apache2 2>/dev/null | grep -c "ok installed"
 then
  sudo apt update
  sudo apt -y install hostapd dnsmasq apache2 php
+ sudo cp -rT /home/pi/pivilion/config/html /var/www/html/pivilion/gen
 fi
 echo "Configuring components..."
 sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf
 sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf
-sudo cp -rT /home/pi/pivilion/config/html /var/www/html/pivilion/gen
+sudo cp /home/pi/pivilion/config/html/.htaccess /var/www/html/pivilion/gen/.htaccess
 sudo chown -R www-data:www-data /var/www/html
 sudo chown root:www-data /var/www/html/pivilion/gen/.htaccess
 sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local

usr/local/bin/htaccess

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Would you like to remove or reset htaccess redirection"
+    select hson in "Reset" "Remove"; do
+        case $hson in
+            Reset) sudo cp /home/pi/pivilion/config/html/.htaccess /var/www/html/pivilion/gen; break;;
+            Remove)  sudo rm /var/www/html/pivilion/gen/.htaccess; break;;
+        esac
+done

usr/local/bin/static

@@ -0,0 +1,18 @@
+#!/bin/bash
+    sudo rm -rf /home/pi/pivilion/static/{,.[!.],..?}*
+    sudo cp -a -R /var/www/html/pivilion/gen /home/pi/pivilion/hotglue/backup
+    wget --mirror --convert-links --adjust-extension --page-requisites --restrict-file-names=ascii,windows http://127.0.0.1 -P /home/pi/pivilion/static
+    sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}*
+    sudo cp -rT /home/pi/pivilion/static/127.0.0.1 /var/www/html/pivilion/gen
+    sudo mv /var/www/html/pivilion/gen/index.html //var/www/html/pivilion/gen/index.php
+    sudo chown -R pi:pi /home/pi
+    sudo chown -R www-data:www-data /var/www/; 
+    sudo chmod -R 775 /var/www;
+    echo "Are you using static HTML with hotspot or onion mode?"
+    select hson in "Hotspot" "Onion"; do
+        case $hson in
+            Hotspot ) sudo cp /home/pi/pivilion/config/html/.htaccess /var/www/html/pivilion/gen; break;;
+            Onion )  sudo rm /var/www/html/pivilion/gen/.htaccess; break;;
+        esac
+    done
+exit 0