From 9ca4451ef41a8e9065a4e646cb47eb463fdfe8c8 Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Wed, 22 May 2024 15:20:05 -0400
Subject: [PATCH] Use curl instead

Downloads ttyd and tailscale with curl now. Needed for newer RM520 firmwares.
---
 RMxxx_rgmii_toolkit.sh                      | 2 ++
 simpleupdates/scripts/update_simpleadmin.sh | 6 +++++-
 simpleupdates/scripts/update_tailscale.sh   | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh
index cafee80..3a96734 100644
--- a/RMxxx_rgmii_toolkit.sh
+++ b/RMxxx_rgmii_toolkit.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Define toolkit paths
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 GITUSER="iamromulan"
 GITTREE="development"
 GITMAINTREE="main"
@@ -485,6 +486,7 @@ tailscale_menu() {
 # Function to install, update, or remove Tailscale
 install_update_tailscale() {
 echo -e "\e[1;31m2) Installing tailscale from the $GITTREE branch\e[0m"
+			ensure_entware_installed
 			mkdir /usrdata/simpleupdates > /dev/null 2>&1
 		    mkdir /usrdata/simpleupdates/scripts > /dev/null 2>&1
 		    wget -O /usrdata/simpleupdates/scripts/update_tailscale.sh https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleupdates/scripts/update_tailscale.sh && chmod +x /usrdata/simpleupdates/scripts/update_tailscale.sh
diff --git a/simpleupdates/scripts/update_simpleadmin.sh b/simpleupdates/scripts/update_simpleadmin.sh
index f19350c..0d85685 100644
--- a/simpleupdates/scripts/update_simpleadmin.sh
+++ b/simpleupdates/scripts/update_simpleadmin.sh
@@ -8,6 +8,7 @@ SERVICE_FILE="/lib/systemd/system/install_simpleadmin.service"
 SERVICE_NAME="install_simpleadmin"
 TMP_SCRIPT="/tmp/install_simpleadmin.sh"
 LOG_FILE="/tmp/install_simpleadmin.log"
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 
 # Tmp Script dependent constants 
 SIMPLE_ADMIN_DIR="/usrdata/simpleadmin"
@@ -47,6 +48,8 @@ cat <<EOF > "$TMP_SCRIPT"
 GITUSER="iamromulan"
 GITTREE="development"
 SIMPLE_ADMIN_DIR="/usrdata/simpleadmin"
+export HOME=/usrdata/root
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 
 # Function to remount file system as read-write
 remount_rw() {
@@ -159,6 +162,7 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/sms.html
    			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/logout.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/scanner.html
+			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/watchcat.html
 			sleep 1
 			cd $SIMPLE_ADMIN_DIR/www/js
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/js/alpinejs.min.js
@@ -196,7 +200,7 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
 install_ttyd() {
     echo -e "\e[1;34mStarting ttyd installation process...\e[0m"
     cd $SIMPLE_ADMIN_DIR/console
-    wget "https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.armhf" && chmod +x ttyd
+    curl -L -o ttyd https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.armhf && chmod +x ttyd
     wget "https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/console/ttyd.bash" && chmod +x console/ttyd.bash
     cd $SIMPLE_ADMIN_DIR/systemd/ttyd.service
 	wget "https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/systemd/ttyd.service"
diff --git a/simpleupdates/scripts/update_tailscale.sh b/simpleupdates/scripts/update_tailscale.sh
index 7179e31..bc32c0e 100644
--- a/simpleupdates/scripts/update_tailscale.sh
+++ b/simpleupdates/scripts/update_tailscale.sh
@@ -8,6 +8,7 @@ SERVICE_FILE="/lib/systemd/system/install_tailscale.service"
 SERVICE_NAME="install_tailscale"
 TMP_SCRIPT="/tmp/install_tailscale.sh"
 LOG_FILE="/tmp/install_sshd.log"
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 
 # Tmp Script dependent constants 
 TAILSCALE_DIR="/usrdata/tailscale/"
@@ -46,6 +47,7 @@ cat <<EOF > "$TMP_SCRIPT"
 #!/bin/bash
 
 export HOME=/usrdata/root
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 GITUSER="iamromulan"
 GITTREE="development"
 TAILSCALE_DIR="/usrdata/tailscale/"
@@ -75,7 +77,7 @@ install_update_tailscale() {
         mkdir -p "$TAILSCALE_DIR" "$TAILSCALE_SYSD_DIR"
         echo "Downloading binary files..."
         cd /usrdata
-        wget https://pkgs.tailscale.com/stable/tailscale_1.64.0_arm.tgz
+        curl -O https://pkgs.tailscale.com/stable/tailscale_1.66.4_arm.tgz
         tar -xzf tailscale_1.64.0_arm.tgz
         cd tailscale_1.64.0_arm
         mv tailscale tailscaled "$TAILSCALE_DIR/"