tyk/quectel-rgmii-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use curl instead

Browse Source 
Downloads ttyd and tailscale with curl now. Needed for newer RM520 firmwares.
This commit is contained in:
Cameron Thompson
2024-05-22 15:20:05 -04:00
parent 08b799a906
commit 9ca4451ef4
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RMxxx_rgmii_toolkit.sh
View File

@@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# Define toolkit paths # Define toolkit paths
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
GITUSER="iamromulan" GITUSER="iamromulan"
GITTREE="development" GITTREE="development"
GITMAINTREE="main" GITMAINTREE="main"
@@ -485,6 +486,7 @@ tailscale_menu() {
# Function to install, update, or remove Tailscale # Function to install, update, or remove Tailscale
install_update_tailscale() { install_update_tailscale() {
echo -e "\e[1;31m2) Installing tailscale from the $GITTREE branch\e[0m" 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 > /dev/null 2>&1
mkdir /usrdata/simpleupdates/scripts > /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 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

6
simpleupdates/scripts/update_simpleadmin.sh
View File

@@ -8,6 +8,7 @@ SERVICE_FILE="/lib/systemd/system/install_simpleadmin.service"
SERVICE_NAME="install_simpleadmin" SERVICE_NAME="install_simpleadmin"
TMP_SCRIPT="/tmp/install_simpleadmin.sh" TMP_SCRIPT="/tmp/install_simpleadmin.sh"
LOG_FILE="/tmp/install_simpleadmin.log" 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 # Tmp Script dependent constants
SIMPLE_ADMIN_DIR="/usrdata/simpleadmin" SIMPLE_ADMIN_DIR="/usrdata/simpleadmin"
@@ -47,6 +48,8 @@ cat <<EOF > "$TMP_SCRIPT"
GITUSER="iamromulan" GITUSER="iamromulan"
GITTREE="development" GITTREE="development"
SIMPLE_ADMIN_DIR="/usrdata/simpleadmin" 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 # Function to remount file system as read-write
remount_rw() { 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/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/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/scanner.html
wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/watchcat.html
sleep 1 sleep 1
cd $SIMPLE_ADMIN_DIR/www/js cd $SIMPLE_ADMIN_DIR/www/js
wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/js/alpinejs.min.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() { install_ttyd() {
echo -e "\e[1;34mStarting ttyd installation process...\e[0m" echo -e "\e[1;34mStarting ttyd installation process...\e[0m"
cd $SIMPLE_ADMIN_DIR/console 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 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 cd $SIMPLE_ADMIN_DIR/systemd/ttyd.service
wget "https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/systemd/ttyd.service" wget "https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/systemd/ttyd.service"

4
simpleupdates/scripts/update_tailscale.sh
View File

@@ -8,6 +8,7 @@ SERVICE_FILE="/lib/systemd/system/install_tailscale.service"
SERVICE_NAME="install_tailscale" SERVICE_NAME="install_tailscale"
TMP_SCRIPT="/tmp/install_tailscale.sh" TMP_SCRIPT="/tmp/install_tailscale.sh"
LOG_FILE="/tmp/install_sshd.log" 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 # Tmp Script dependent constants
TAILSCALE_DIR="/usrdata/tailscale/" TAILSCALE_DIR="/usrdata/tailscale/"
@@ -46,6 +47,7 @@ cat <<EOF > "$TMP_SCRIPT"
#!/bin/bash #!/bin/bash
export HOME=/usrdata/root export HOME=/usrdata/root
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
GITUSER="iamromulan" GITUSER="iamromulan"
GITTREE="development" GITTREE="development"
TAILSCALE_DIR="/usrdata/tailscale/" TAILSCALE_DIR="/usrdata/tailscale/"
@@ -75,7 +77,7 @@ install_update_tailscale() {
mkdir -p "$TAILSCALE_DIR" "$TAILSCALE_SYSD_DIR" mkdir -p "$TAILSCALE_DIR" "$TAILSCALE_SYSD_DIR"
echo "Downloading binary files..." echo "Downloading binary files..."
cd /usrdata 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 tar -xzf tailscale_1.64.0_arm.tgz
cd tailscale_1.64.0_arm cd tailscale_1.64.0_arm
mv tailscale tailscaled "$TAILSCALE_DIR/" mv tailscale tailscaled "$TAILSCALE_DIR/"