From 5030f2c0bd060917af3d3276f4a95b94911804c8 Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 16 May 2025 23:40:53 -0400
Subject: [PATCH] Update deployment

- Updated simpleadmin content deployment script to obtain content from latest PR's #163 and #165

- Updated all deployment scripts to reflect a gitroot branch of development-SDXLEMUR

- Removed an unused deployment script that is no longer needed.
---
 RMxxx_rgmii_toolkit.sh                        |  2 +-
 simpleupdates/scripts/update_simpleadmin.sh   | 18 +++++++-
 .../scripts/update_simplefirewall.sh          |  2 +-
 simpleupdates/scripts/update_simpleupdates.sh | 46 -------------------
 .../scripts/update_socat-at-bridge.sh         |  2 +-
 simpleupdates/scripts/update_sshd.sh          |  2 +-
 simpleupdates/scripts/update_tailscale.sh     |  2 +-
 7 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 simpleupdates/scripts/update_simpleupdates.sh

diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh
index 66a3fad..47a203a 100644
--- a/RMxxx_rgmii_toolkit.sh
+++ b/RMxxx_rgmii_toolkit.sh
@@ -4,7 +4,7 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"
diff --git a/simpleupdates/scripts/update_simpleadmin.sh b/simpleupdates/scripts/update_simpleadmin.sh
index 2972b90..5beb1f1 100644
--- a/simpleupdates/scripts/update_simpleadmin.sh
+++ b/simpleupdates/scripts/update_simpleadmin.sh
@@ -4,7 +4,7 @@
 # Define GitHub repo info
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"
@@ -57,7 +57,7 @@ cat <<EOF > "$TMP_SCRIPT"
 # Define GitHub repo info
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"
@@ -156,6 +156,7 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
 			mkdir $SIMPLE_ADMIN_DIR/www/cgi-bin
 			mkdir $SIMPLE_ADMIN_DIR/www/css
     		mkdir $SIMPLE_ADMIN_DIR/www/js
+    		mkdir $SIMPLE_ADMIN_DIR/www/fonts
             cd $SIMPLE_ADMIN_DIR/systemd
             wget $GITROOT/simpleadmin/systemd/lighttpd.service
 			sleep 1
@@ -194,6 +195,19 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
     		cd $SIMPLE_ADMIN_DIR/www/css
     		wget $GITROOT/simpleadmin/www/css/bootstrap.min.css
       		wget $GITROOT/simpleadmin/www/css/styles.css
+      		wget $GITROOT/simpleadmin/www/css/all.min.css
+      		sleep 1
+      		cd $SIMPLE_ADMIN_DIR/www/fonts
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-300italic.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-300.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-500italic.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-500.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-600italic.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-600.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-700italic.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-700.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-italic.woff2
+      		wget $GITROOT/simpleadmin/www/fonts/poppins-v23-latin-regular.woff2
 			sleep 1
 			cd $SIMPLE_ADMIN_DIR/www/cgi-bin
 			wget $GITROOT/simpleadmin/www/cgi-bin/get_atcommand
diff --git a/simpleupdates/scripts/update_simplefirewall.sh b/simpleupdates/scripts/update_simplefirewall.sh
index 15b7e2f..ddd49d8 100644
--- a/simpleupdates/scripts/update_simplefirewall.sh
+++ b/simpleupdates/scripts/update_simplefirewall.sh
@@ -4,7 +4,7 @@
 # Define GitHub repo info
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"
diff --git a/simpleupdates/scripts/update_simpleupdates.sh b/simpleupdates/scripts/update_simpleupdates.sh
deleted file mode 100644
index a5bede5..0000000
--- a/simpleupdates/scripts/update_simpleupdates.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# WORK IN PROGRESS
-
-# Define constants
-GITUSER="iamromulan"
-GITTREE="development"
-DIR_NAME="simpleupdates"
-SERVICE_FILE="/lib/systemd/system/install_simpleupdates.service"
-SERVICE_NAME="install_simpleupdates"
-TMP_SCRIPT="/tmp/install_simpleupdates.sh"
-LOG_FILE="/tmp/install_simpleupdates.log"
-
-# Tmp Script dependent constants 
-
-
-# Create the systemd service file
-cat <<EOF > "$SERVICE_FILE"
-[Unit]
-Description=Update $DIR_NAME temporary service
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash $TMP_SCRIPT > $LOG_FILE 2>&1
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-# Create and populate the temporary shell script for installation
-cat <<EOF > "$TMP_SCRIPT"
-#!/bin/bash
-
-install_simpleupdates() {
-# CONTENT
-}
-install_simpleupdates
-exit 0
-EOF
-
-# Make the temporary script executable
-chmod +x "$TMP_SCRIPT"
-
-# Reload systemd to recognize the new service and start the update
-systemctl daemon-reload
-systemctl start $SERVICE_NAME
diff --git a/simpleupdates/scripts/update_socat-at-bridge.sh b/simpleupdates/scripts/update_socat-at-bridge.sh
index e05d92a..87f32d0 100644
--- a/simpleupdates/scripts/update_socat-at-bridge.sh
+++ b/simpleupdates/scripts/update_socat-at-bridge.sh
@@ -4,7 +4,7 @@
 # Define GitHub repo info
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"
diff --git a/simpleupdates/scripts/update_sshd.sh b/simpleupdates/scripts/update_sshd.sh
index 94e098f..68fc9d2 100644
--- a/simpleupdates/scripts/update_sshd.sh
+++ b/simpleupdates/scripts/update_sshd.sh
@@ -4,7 +4,7 @@
 # Define GitHub repo info
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"
diff --git a/simpleupdates/scripts/update_tailscale.sh b/simpleupdates/scripts/update_tailscale.sh
index b79794e..2ced955 100644
--- a/simpleupdates/scripts/update_tailscale.sh
+++ b/simpleupdates/scripts/update_tailscale.sh
@@ -4,7 +4,7 @@
 # Define GitHub repo info
 GITUSER="iamromulan"
 REPONAME="quectel-rgmii-toolkit"
-GITTREE="SDXLEMUR"
+GITTREE="development-SDXLEMUR"
 GITMAINTREE="SDXLEMUR"
 GITDEVTREE="development-SDXLEMUR"
 GITROOT="https://raw.githubusercontent.com/$GITUSER/$REPONAME/$GITTREE"