diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh index 295589f..7447730 100644 --- a/RMxxx_rgmii_toolkit.sh +++ b/RMxxx_rgmii_toolkit.sh @@ -149,7 +149,7 @@ ensure_entware_installed() { remount_rw if [ ! -f "/opt/bin/opkg" ]; then echo -e "\e[1;32mInstalling Entware/OPKG\e[0m" - cd /tmp && wget -O installentware.sh "$GITROOT/installentware.sh" && chmod +x installentware.sh && ./installentware.sh + cd /tmp && curl -o installentware.sh "$GITROOT/installentware.sh" && chmod +x installentware.sh && ./installentware.sh if [ "$?" -ne 0 ]; then echo -e "\e[1;31mEntware/OPKG installation failed. Please check your internet connection or the repository URL.\e[0m" exit 1 @@ -443,8 +443,8 @@ set_simpleadmin_passwd(){ ensure_entware_installed opkg update opkg install libaprutil - wget -O /usrdata/root/bin/htpasswd $GITROOT/simpleadmin/htpasswd && chmod +x /usrdata/root/bin/htpasswd - wget -O /usrdata/root/bin/simplepasswd $GITROOT/simpleadmin/simplepasswd && chmod +x /usrdata/root/bin/simplepasswd + curl -o /usrdata/root/bin/htpasswd "$GITROOT/simpleadmin/htpasswd" && chmod +x /usrdata/root/bin/htpasswd + curl -o /usrdata/root/bin/simplepasswd "$GITROOT/simpleadmin/simplepasswd" && chmod +x /usrdata/root/bin/simplepasswd echo -e "\e[1;32mTo change your simpleadmin (admin) password in the future...\e[0m" echo -e "\e[1;32mIn the console type simplepasswd and press enter\e[0m" /usrdata/root/bin/simplepasswd @@ -463,20 +463,20 @@ install_simple_admin() { echo -e "\e[1;31m2) Installing Simpleadmin 2.0\e[0m" mkdir /usrdata/simpleupdates > /dev/null 2>&1 mkdir /usrdata/simpleupdates/scripts > /dev/null 2>&1 - wget -O /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh $GITROOT/simpleupdates/scripts/update_socat-at-bridge.sh && chmod +x /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh + curl -o /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh "$GITROOT/simpleupdates/scripts/update_socat-at-bridge.sh" && chmod +x /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh echo -e "\e[1;32mInstalling/updating dependency: socat-at-bridge\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh echo -e "\e[1;32m Dependency: socat-at-bridge has been updated/installed.\e[0m" sleep 1 - wget -O /usrdata/simpleupdates/scripts/update_simplefirewall.sh $GITROOT/simpleupdates/scripts/update_simplefirewall.sh && chmod +x /usrdata/simpleupdates/scripts/update_simplefirewall.sh + curl -o /usrdata/simpleupdates/scripts/update_simplefirewall.sh "$GITROOT/simpleupdates/scripts/update_simplefirewall.sh" && chmod +x /usrdata/simpleupdates/scripts/update_simplefirewall.sh echo -e "\e[1;32mInstalling/updating dependency: simplefirewall\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_simplefirewall.sh echo -e "\e[1;32m Dependency: simplefirewall has been updated/installed.\e[0m" sleep 1 set_simpleadmin_passwd - wget -O /usrdata/simpleupdates/scripts/update_simpleadmin.sh $GITROOT/simpleupdates/scripts/update_simpleadmin.sh && chmod +x /usrdata/simpleupdates/scripts/update_simpleadmin.sh + curl -o /usrdata/simpleupdates/scripts/update_simpleadmin.sh "$GITROOT/simpleupdates/scripts/update_simpleadmin.sh" && chmod +x /usrdata/simpleupdates/scripts/update_simpleadmin.sh echo -e "\e[1;32mInstalling/updating: Simpleadmin content\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_simpleadmin.sh @@ -702,7 +702,7 @@ install_update_tailscale() { 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 $GITROOT/simpleupdates/scripts/update_tailscale.sh && chmod +x /usrdata/simpleupdates/scripts/update_tailscale.sh + curl -o /usrdata/simpleupdates/scripts/update_tailscale.sh "$GITROOT/simpleupdates/scripts/update_tailscale.sh" && chmod +x /usrdata/simpleupdates/scripts/update_tailscale.sh echo -e "\e[1;32mInstalling/updating: Tailscale\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" remount_rw @@ -759,8 +759,8 @@ configure_tailscale() { 1) remount_rw cd /lib/systemd/system/ - wget -O tailscale-webui.service $GITROOT/tailscale/systemd/tailscale-webui.service - wget -O tailscale-webui-trigger.service $GITROOT/tailscale/systemd/tailscale-webui-trigger.service + curl -o tailscale-webui.service "$GITROOT/tailscale/systemd/tailscale-webui.service" + curl -o tailscale-webui-trigger.service "$GITROOT/tailscale/systemd/tailscale-webui-trigger.service" ln -sf /lib/systemd/system/tailscale-webui-trigger.service /lib/systemd/system/multi-user.target.wants/ systemctl daemon-reload echo "Tailscale Web UI Enabled" @@ -811,7 +811,7 @@ install_sshd() { ensure_entware_installed mkdir /usrdata/simpleupdates > /dev/null 2>&1 mkdir /usrdata/simpleupdates/scripts > /dev/null 2>&1 - wget -O /usrdata/simpleupdates/scripts/update_sshd.sh $GITROOT/simpleupdates/scripts/update_sshd.sh && chmod +x /usrdata/simpleupdates/scripts/update_sshd.sh + curl -o /usrdata/simpleupdates/scripts/update_sshd.sh "$GITROOT/simpleupdates/scripts/update_sshd.sh" && chmod +x /usrdata/simpleupdates/scripts/update_sshd.sh echo -e "\e[1;32mUpdating: SSHd\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_sshd.sh @@ -836,7 +836,7 @@ install_sshd() { ensure_entware_installed mkdir /usrdata/simpleupdates > /dev/null 2>&1 mkdir /usrdata/simpleupdates/scripts > /dev/null 2>&1 - wget -O /usrdata/simpleupdates/scripts/update_sshd.sh $GITROOT/simpleupdates/scripts/update_sshd.sh && chmod +x /usrdata/simpleupdates/scripts/update_sshd.sh + curl -o /usrdata/simpleupdates/scripts/update_sshd.sh "$GITROOT/simpleupdates/scripts/update_sshd.sh" && chmod +x /usrdata/simpleupdates/scripts/update_sshd.sh echo -e "\e[1;32mInstalling: SSHd\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_sshd.sh @@ -851,7 +851,7 @@ install_speedtest_cli() { mkdir /usrdata/root mkdir /usrdata/root/bin cd /usrdata/root/bin - wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-armhf.tgz + curl -O https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-armhf.tgz tar -xzf ookla-speedtest-1.2.0-linux-armhf.tgz rm ookla-speedtest-1.2.0-linux-armhf.tgz rm speedtest.md @@ -872,7 +872,7 @@ install_fast_cli() { mkdir /usrdata/root mkdir /usrdata/root/bin cd /usrdata/root/bin - wget -O fast https://code.060070.xyz/sky/simple-admin/raw/branch/main/tools/fast_linux_arm && chmod +x fast + curl -o fast "https://code.060070.xyz/sky/simple-admin/raw/branch/main/tools/fast_linux_arm" && chmod +x fast cd / ln -sf /usrdata/root/bin/fast /bin remount_ro @@ -891,7 +891,7 @@ install_update_at_socat() { ensure_entware_installed mkdir /usrdata/simpleupdates > /dev/null 2>&1 mkdir /usrdata/simpleupdates/scripts > /dev/null 2>&1 - wget -O /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh $GITROOT/simpleupdates/scripts/update_socat-at-bridge.sh && chmod +x /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh + curl -o /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh "$GITROOT/simpleupdates/scripts/update_socat-at-bridge.sh" && chmod +x /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh echo -e "\e[1;32mInstalling/updating: AT Socat Bridge\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh @@ -908,7 +908,7 @@ install_simple_firewall() { ensure_entware_installed mkdir /usrdata/simpleupdates > /dev/null 2>&1 mkdir /usrdata/simpleupdates/scripts > /dev/null 2>&1 - wget -O /usrdata/simpleupdates/scripts/update_simplefirewall.sh $GITROOT/simpleupdates/scripts/update_simplefirewall.sh && chmod +x /usrdata/simpleupdates/scripts/update_simplefirewall.sh + curl -o /usrdata/simpleupdates/scripts/update_simplefirewall.sh "$GITROOT/simpleupdates/scripts/update_simplefirewall.sh" && chmod +x /usrdata/simpleupdates/scripts/update_simplefirewall.sh echo -e "\e[1;32mInstalling/updating: Simple Firewall\e[0m" echo -e "\e[1;32mPlease Wait....\e[0m" /usrdata/simpleupdates/scripts/update_simplefirewall.sh @@ -923,7 +923,7 @@ install_simple_firewall() { check_architecture() { ARCH=$(uname -a) if echo "$ARCH" | grep -q "aarch64"; then - cd /tmp && wget -O RM55x_rcPCIe_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/SDXPINN/RM55x_rcPCIe_toolkit.sh && chmod +x RM55x_rcPCIe_toolkit.sh && ./RM55x_rcPCIe_toolkit.sh && cd / + cd /tmp && curl -o RM55x_rcPCIe_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/SDXPINN/RM55x_rcPCIe_toolkit.sh && chmod +x RM55x_rcPCIe_toolkit.sh && ./RM55x_rcPCIe_toolkit.sh && cd / exit 0 elif echo "$ARCH" | grep -q "armv7l"; then # Continue if architecture is armv7l