diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh index 55ae395..66a3fad 100644 --- a/RMxxx_rgmii_toolkit.sh +++ b/RMxxx_rgmii_toolkit.sh @@ -109,7 +109,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 "https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/installentware.sh" && chmod +x installentware.sh && ./installentware.sh + cd /tmp && wget -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 @@ -308,8 +308,8 @@ set_simpleadmin_passwd(){ ensure_entware_installed opkg update opkg install libaprutil - wget -O /usrdata/root/bin/htpasswd https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/htpasswd && chmod +x /usrdata/root/bin/htpasswd - wget -O /usrdata/root/bin/simplepasswd https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/simplepasswd && chmod +x /usrdata/root/bin/simplepasswd + 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 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 @@ -325,23 +325,23 @@ set_root_passwd() { install_simple_admin() { echo -e "\e[1;32mInstalling Simpleadmin 2.0\e[0m" ensure_entware_installed - echo -e "\e[1;31m2) Installing simpleadmin from the development test branch\e[0m" + 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 https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleupdates/scripts/update_socat-at-bridge.sh && chmod +x /usrdata/simpleupdates/scripts/update_socat-at-bridge.sh + 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 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 https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleupdates/scripts/update_simplefirewall.sh && chmod +x /usrdata/simpleupdates/scripts/update_simplefirewall.sh + wget -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 https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleupdates/scripts/update_simpleadmin.sh && chmod +x /usrdata/simpleupdates/scripts/update_simpleadmin.sh + wget -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 @@ -470,7 +470,7 @@ 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 + wget -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 @@ -496,8 +496,8 @@ configure_tailscale() { 1) remount_rw cd /lib/systemd/system/ - wget -O tailscale-webui.service https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/main/tailscale/systemd/tailscale-webui.service - wget -O tailscale-webui-trigger.service https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/main/tailscale/systemd/tailscale-webui-trigger.service + wget -O tailscale-webui.service $GITROOT/tailscale/systemd/tailscale-webui.service + wget -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"