From 2a6f41e73ee6be19f52b1ae1c2a7ed93b8451219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 18:17:29 +0800 Subject: [PATCH 01/13] Update catwrt_opkg_list_installed v1 --- cattools.sh | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/cattools.sh b/cattools.sh index 05faaea..ad5f602 100644 --- a/cattools.sh +++ b/cattools.sh @@ -2,6 +2,7 @@ # env DEFAULT_IP="192.168.1.4" RELEASE="/etc/catwrt_release" +BACKUP_FILE="/etc/catwrt_opkg_list_installed" API_URL="https://api.miaoer.xyz/api/v2/snippets/catwrt/update" AMD64_EFI_SYSUP="https://raw.githubusercontent.com/miaoermua/cattools/main/sysupgrade/amd64/sysup_efi" AMD64_BIOS_SYSUP="https://raw.githubusercontent.com/miaoermua/cattools/main/sysupgrade/amd64/sysup_bios" @@ -883,6 +884,110 @@ sysupgrade(){ fi } +# catwrt_opkg_list_installed +catwrt_opkg_list_installed(){ + PACKAGES=( + "luci-app-aria2" + "luci-app-acme" + "luci-app-adguardhome" + "luci-app-ssr-plus" + "luci-app-passwall" + "luci-app-openclash" + "luci-app-oaf" + "luci-app-mosdns" + "luci-app-ddns-go" + "luci-app-store" + "luci-i18n-adbyby-plus-zh-cn" + "luci-i18n-adblock-zh-cn" + "luci-i18n-airplay2-zh-cn" + "luci-i18n-design-config-zh-cn" + "luci-app-argon-config" + "luci-app-cifs-mount" + "luci-i18n-diskman-zh-cn" + "luci-i18n-frpc-zh-cn" + "luci-i18n-frps-zh-cn" + "luci-i18n-ipsec-server-zh-cn" + "luci-i18n-ipsec-vpnd-zh-cn" + "luci-i18n-mwan3-zh-cn" + "luci-i18n-mwan3helper-zh-cn" + "luci-i18n-n2n-zh-cn" + "luci-i18n-nps-zh-cn" + "luci-i18n-openvpn-server-zh-cn" + "luci-i18n-openvpn-zh-cn" + "luci-i18n-netdata-zh-cn" + "luci-i18n-pppoe-relay-zh-cn" + "luci-i18n-qbittorrent-zh-cn" + "luci-i18n-qos-zh-cn" + "luci-i18n-samba4-zh-cn" + "luci-i18n-smartdns-zh-cn" + "luci-i18n-socat-zh-cn" + "luci-i18n-sqm-zh-cn" + "luci-i18n-transmission-zh-cn" + "luci-i18n-ttyd-zh-cn" + "luci-i18n-udpxy-zh-cn" + "luci-i18n-uhttpd-zh-cn" + "luci-i18n-unblockmusic-zh-cn" + "luci-i18n-uugamebooster-zh-cn" + "luci-i18n-wireguard-zh-cn" + "luci-i18n-xlnetacc-zh-cn" + "luci-i18n-zerotier-zh-cn" + "luci-app-dockerman" + "luci-app-docker" + "ua2f" + "vim" + "nano" + "igmpproxy" + ) + + if ! grep -q -E "catwrt|repo.miaoer.xyz" /etc/opkg/distfeeds.conf && ! ip a | grep -q -E "192\.168\.[0-9]+\.[0-9]+|10\.[0-9]+\.[0-9]+\.[0-9]+|172\.1[6-9]\.[0-9]+\.[0-9]+|172\.2[0-9]+\.[0-9]+|172\.3[0-1]\.[0-9]+\.[0-9]+"; then + echo "请先配置软件源" + exit 1 + fi + + backup_installed_packages() { + echo "[INFO] 备份白名单中的已安装软件包列表..." + > "$BACKUP_FILE" + for package in "${PACKAGES[@]}"; do + if opkg list_installed | grep -q "^$package "; then + echo "$package" >> "$BACKUP_FILE" + fi + done + echo "[INFO] 备份完成" + } + + restore_installed_packages() { + echo "[INFO] 还原备份的软件包列表..." + if [ -f "$BACKUP_FILE" ]; then + while IFS= read -r package; do + if ! opkg list_installed | grep -q "^$package "; then + echo "安装缺失的软件包: $package" + opkg update && opkg install "$package" + fi + done < "$BACKUP_FILE" + echo "还原完成" + else + echo "未检测到备份文件，跳过还原步骤..." + fi + } + + main() { + if [ -f "$BACKUP_FILE" ]; then + read -p "检测到备份文件，是否需要恢复软件包？([ENTER] 确认 / [0] 取消) " choice + case "$choice" in + 0) + echo "你选择了不恢复，打算重新开始!如果你有需要请回来找我!" + ;; + *) + restore_installed_packages + ;; + esac + else + backup_installed_packages + fi + } + main + } + # Enhancement MENU enhancement_menu() { echo "" From 5d7f41a8cf94bc7840e8a182a3c3d463c4bf911e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 18:32:58 +0800 Subject: [PATCH 02/13] Update restore_installed_packages --- cattools.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/cattools.sh b/cattools.sh index ad5f602..25b3922 100644 --- a/cattools.sh +++ b/cattools.sh @@ -945,28 +945,32 @@ catwrt_opkg_list_installed(){ fi backup_installed_packages() { - echo "[INFO] 备份白名单中的已安装软件包列表..." + echo "备份白名单中的已安装软件包列表..." > "$BACKUP_FILE" for package in "${PACKAGES[@]}"; do if opkg list_installed | grep -q "^$package "; then echo "$package" >> "$BACKUP_FILE" fi done - echo "[INFO] 备份完成" + echo "备份完成" } restore_installed_packages() { - echo "[INFO] 还原备份的软件包列表..." + opkg list_installed | awk '{print \$1}' > /tmp/default_installed_packages if [ -f "$BACKUP_FILE" ]; then while IFS= read -r package; do + if grep -q "^$package$" "$DEFAULT_PACKAGES_FILE"; then + echo "跳过固件默认包含的软件包: $package" + continue + fi if ! opkg list_installed | grep -q "^$package "; then - echo "安装缺失的软件包: $package" - opkg update && opkg install "$package" + echo "安装固件默认缺失的软件包: $package" + opkg install "$package" fi done < "$BACKUP_FILE" - echo "还原完成" + echo "安装完成" else - echo "未检测到备份文件，跳过还原步骤..." + echo "未检测到备份文件!寄了!" fi } @@ -984,6 +988,8 @@ catwrt_opkg_list_installed(){ else backup_installed_packages fi + + rm -f /tmp/default_installed_packages } main } From df7db3bf67fdf8231ac5efd6019b5e2b58de000a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:03:38 +0800 Subject: [PATCH 03/13] Update Packages support --- cattools.sh | 95 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 10 deletions(-) diff --git a/cattools.sh b/cattools.sh index 25b3922..5da6740 100644 --- a/cattools.sh +++ b/cattools.sh @@ -849,6 +849,13 @@ sysupgrade(){ else firmware_url=$AMD64_BIOS_SYSUP fi + + if [ -f /etc/catwrt_opkg_list_installed ]; then + rm /etc/catwrt_opkg_list_installed + fi + + catwrt_opkg_list_installed + echo "已经生成备份软件包列表，方便你后续更新后恢复部分消失的插件和软件" echo "" echo "Warning:" @@ -887,56 +894,124 @@ sysupgrade(){ # catwrt_opkg_list_installed catwrt_opkg_list_installed(){ PACKAGES=( - "luci-app-aria2" - "luci-app-acme" - "luci-app-adguardhome" - "luci-app-ssr-plus" - "luci-app-passwall" - "luci-app-openclash" - "luci-app-oaf" - "luci-app-mosdns" - "luci-app-ddns-go" - "luci-app-store" + "luci-app-adbyby-plus" "luci-i18n-adbyby-plus-zh-cn" + "luci-app-adblock" "luci-i18n-adblock-zh-cn" + "luci-app-airplay2" "luci-i18n-airplay2-zh-cn" + "luci-app-design-config" "luci-i18n-design-config-zh-cn" "luci-app-argon-config" "luci-app-cifs-mount" + "luci-app-diskman" "luci-i18n-diskman-zh-cn" + "luci-app-ddns-go" + "luci-i18n-ddns-go-zh-cn" + "luci-app-frpc" "luci-i18n-frpc-zh-cn" + "luci-app-frps" "luci-i18n-frps-zh-cn" + "luci-app-ipsec-server" "luci-i18n-ipsec-server-zh-cn" + "luci-app-ipsec-vpnd" "luci-i18n-ipsec-vpnd-zh-cn" + "luci-app-mwan3" "luci-i18n-mwan3-zh-cn" + "luci-app-mwan3helper" "luci-i18n-mwan3helper-zh-cn" + "luci-app-n2n" "luci-i18n-n2n-zh-cn" + "luci-app-nps" "luci-i18n-nps-zh-cn" + "luci-app-openvpn-server" "luci-i18n-openvpn-server-zh-cn" + "luci-app-openvpn" "luci-i18n-openvpn-zh-cn" + "luci-app-oaf" + "luci-i18n-oaf-zh-cn" + "luci-app-netdata" "luci-i18n-netdata-zh-cn" + "luci-app-pppoe-relay" "luci-i18n-pppoe-relay-zh-cn" + "luci-app-qbittorrent" "luci-i18n-qbittorrent-zh-cn" + "luci-app-qos" "luci-i18n-qos-zh-cn" + "luci-app-samba4" "luci-i18n-samba4-zh-cn" + "luci-app-smartdns" "luci-i18n-smartdns-zh-cn" + "luci-app-socat" "luci-i18n-socat-zh-cn" + "luci-app-sqm" "luci-i18n-sqm-zh-cn" + "luci-app-transmission" "luci-i18n-transmission-zh-cn" + "luci-app-ttyd" "luci-i18n-ttyd-zh-cn" + "luci-app-udpxy" "luci-i18n-udpxy-zh-cn" + "luci-app-uhttpd" "luci-i18n-uhttpd-zh-cn" + "luci-app-unblockmusic" "luci-i18n-unblockmusic-zh-cn" + "luci-app-uugamebooster" "luci-i18n-uugamebooster-zh-cn" + "luci-app-wireguard" "luci-i18n-wireguard-zh-cn" + "luci-app-xlnetacc" "luci-i18n-xlnetacc-zh-cn" + "luci-app-zerotier" "luci-i18n-zerotier-zh-cn" "luci-app-dockerman" + "luci-app-usb-printer" + "luci-i18n-usb-printer-zh-cn" + "luci-i18n-dockerman-zh-cn" "luci-app-docker" + "luci-i18n-docker-zh-cn" + "luci-app-ssr-plus" + "luci-i18n-ssr-plus-zh-cn" + "luci-app-passwall" + "luci-i18n-passwall-zh-cn" + "luci-app-passwall2" + "luci-i18n-passwall2-zh-cn" + "luci-app-openclash" + "luci-app-poweroff" + "luci-app-passwall2" + "luci-i18n-passwall2-zh-cn" + "luci-app-LingTiGameAcc" + "luci-app-usb3disable" + "luci-app-pushbot" + "luci-app-store" + "luci-app-serverchan" + "luci-app-nezha-agent" + "luci-theme-design" + "luci-app-design-config" + "luci-theme-argon" + "luci-app-argon-config" + "luci-app-eqos" "ua2f" "vim" "nano" + "nginx" + "ethtool" + "tailscale" "igmpproxy" + "openssh-client" + "openssh-keygen" + "openssh-server" + "openssh-sftp-server" + "kmod-usb2" + "kmod-usb3" + "kmod-usb-net-ipheth" + "libimobiledevice-utils" + "usbmuxd" + "kmod-usb-net-rndis" + "kmod-nls-base" + "kmod-usb-core" + "kmod-usb-net" + "kmod-usb-net-cdc-ether" ) if ! grep -q -E "catwrt|repo.miaoer.xyz" /etc/opkg/distfeeds.conf && ! ip a | grep -q -E "192\.168\.[0-9]+\.[0-9]+|10\.[0-9]+\.[0-9]+\.[0-9]+|172\.1[6-9]\.[0-9]+\.[0-9]+|172\.2[0-9]+\.[0-9]+|172\.3[0-1]\.[0-9]+\.[0-9]+"; then From c05faa1aabef4f18d930b3445561b286a6057d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:14:16 +0800 Subject: [PATCH 04/13] Update cattools.sh --- cattools.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cattools.sh b/cattools.sh index 5da6740..de83b22 100644 --- a/cattools.sh +++ b/cattools.sh @@ -991,6 +991,7 @@ catwrt_opkg_list_installed(){ "luci-theme-argon" "luci-app-argon-config" "luci-app-eqos" + "speedtest-go" "ua2f" "vim" "nano" @@ -1020,7 +1021,7 @@ catwrt_opkg_list_installed(){ fi backup_installed_packages() { - echo "备份白名单中的已安装软件包列表..." + echo "名单中已安装软件包列表..." > "$BACKUP_FILE" for package in "${PACKAGES[@]}"; do if opkg list_installed | grep -q "^$package "; then From 1c680bbacd7250dec9be9e9a8836f9dd8b7e806e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:27:55 +0800 Subject: [PATCH 05/13] Update sponsor us --- cattools.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cattools.sh b/cattools.sh index de83b22..5454a0b 100644 --- a/cattools.sh +++ b/cattools.sh @@ -1052,6 +1052,20 @@ catwrt_opkg_list_installed(){ main() { if [ -f "$BACKUP_FILE" ]; then + echo "sponsor us" + echo "=========================================================================" + echo "你执行的下面命令如果使用的主站软件源 repo.miaoer.xyz 将对服务器带宽产生新的挑战" + echo "我们希望你在使用后继续支持我们，继续为您提供更好的服务" + echo "如果不想支持我们也可以使用免费 serverless 提供的镜像服务选择非主站即可" + echo "不会对我们服务器造成流量激增，但访问速度受限于国际互联网" + echo "" + echo "https://www.miaoer.xyz/sponsor" + echo "" + echo "你可以复制下链接在浏览器上打开，待恢复软件包后再进行支付!" + + sleep 3 + + echo "" read -p "检测到备份文件，是否需要恢复软件包？([ENTER] 确认 / [0] 取消) " choice case "$choice" in 0) From 7e1c1fb677a627228c03468ecc60f1c8475c72c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:39:22 +0800 Subject: [PATCH 06/13] Update MENU --- cattools.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cattools.sh b/cattools.sh index 5454a0b..e69afbd 100644 --- a/cattools.sh +++ b/cattools.sh @@ -62,13 +62,14 @@ menu() { echo " https://github.com/miaoermua/cattools " echo "----------------------------------------------------------" echo "1. SetIP - 设置 IP" - echo "2. network_wizard - 网络向导" + echo "2. Network_Wizard - 网络向导" echo "3. Debug - 抓取日志" - echo "4. catwrt_update - 检查更新" - echo "5. apply_repo - 软件源配置" - echo "6. diagnostics - 网络诊断" - echo "7. sysupgrade - 系统更新" - echo "8. enhancement - 实用增强" + echo "4. Catwrt_Update - 检查更新" + echo "5. Apply_Repo - 软件源配置" + echo "6. Diagnostics - 网络诊断" + echo "7. Sysupgrade - 系统更新" + echo "8. Reinstalld_packages - 软件包恢复" + echo "9. Enhancement - 实用增强" echo "0. Exit - 退出" echo "----------------------------------------------------------" echo -n "请输入数字并回车(Please enter your choice): " @@ -1510,6 +1511,9 @@ while true; do sysupgrade ;; 8) + catwrt_opkg_list_installed + ;; + 9) enhancement_menu ;; 0) From 77a3de6509a875737dca8000fb8008ba9075fd79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:49:16 +0800 Subject: [PATCH 07/13] Update cattools.sh --- cattools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cattools.sh b/cattools.sh index e69afbd..582bd9d 100644 --- a/cattools.sh +++ b/cattools.sh @@ -1022,7 +1022,7 @@ catwrt_opkg_list_installed(){ fi backup_installed_packages() { - echo "名单中已安装软件包列表..." + echo "正在备份名单中已安装软件包列表..." > "$BACKUP_FILE" for package in "${PACKAGES[@]}"; do if opkg list_installed | grep -q "^$package "; then From 81cf0ec2f65534ec4532de18470339b72614348d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:53:26 +0800 Subject: [PATCH 08/13] Update README.md --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 38cfc6a..5ad97ef 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,14 @@ curl https://raw.githubusercontent.com/miaoermua/cattools/main/install.sh | bash - [x] 热更新和安装脚本 - [x] 命令行参数 - [x] 1. SetIP - 设置 IP -- [x] 2. network_wizard - 网络向导(旁路网关) +- [x] 2. Network_Wizard - 网络向导(旁路网关) - [x] 3. Debug - 抓取日志 -- [x] 4. catwrt_update - 检查更新 -- [x] 5. apply_repo - 软件源配置 -- [x] 6. sysupgrade - 系统更新 -- [x] 7. diagnostics - 网络诊断 -- [x] 8. enhancement - 实用增强 +- [x] 4. Catwrt_Update - 检查更新 +- [x] 5. Apply_Repo - 软件源配置 +- [x] 6. Sysupgrade - 系统更新 +- [x] 7. Diagnostics - 网络诊断 +- [x] 8. Reinstalld_packages - 软件包恢复(升级系统后) +- [x] 9. Enhancement - 实用增强 - [x] |—— 1. Mihomo 配置 - [x] |—— 2. Tailscale 配置 - [x] |—— 3. TTYD 配置(危险) @@ -30,11 +31,10 @@ curl https://raw.githubusercontent.com/miaoermua/cattools/main/install.sh | bash - [x] |—— 6. 重置系统 - [x] 0. Exit - 退出 -*大饼* +喵二的*大饼* 新建文件夹中... -- [ ] 预设 Wi-FI 配置(wireless) -- [ ] 升级插件(升级系统后) -- [ ] mt798x 系列升级系统 -- [ ] 插件商店 -- [ ] 自动挂载扩容 -- [ ] NAS 快速配置(SMB) +- [ ] 预设 Wi-FI 配置(wireless) - 位于 网络向导 +- [ ] mt798x 系列升级系统 - 位于 系统更新 +- [ ] 插件商店 - 位于实用增强 +- [ ] 自动挂载扩容 - 位于实用增强 +- [ ] NAS 快速配置(SMB) - 位于实用增强 From 070119cb906424373996835ef758681894266d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:38:09 +0800 Subject: [PATCH 09/13] Update Restore Packages --- cattools.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cattools.sh b/cattools.sh index 582bd9d..8fe9209 100644 --- a/cattools.sh +++ b/cattools.sh @@ -62,14 +62,14 @@ menu() { echo " https://github.com/miaoermua/cattools " echo "----------------------------------------------------------" echo "1. SetIP - 设置 IP" - echo "2. Network_Wizard - 网络向导" + echo "2. network_wizard - 网络向导" echo "3. Debug - 抓取日志" - echo "4. Catwrt_Update - 检查更新" - echo "5. Apply_Repo - 软件源配置" - echo "6. Diagnostics - 网络诊断" - echo "7. Sysupgrade - 系统更新" - echo "8. Reinstalld_packages - 软件包恢复" - echo "9. Enhancement - 实用增强" + echo "4. catwrt_update - 检查更新" + echo "5. apply_repo - 软件源配置" + echo "6. diagnostics - 网络诊断" + echo "7. sysupgrade - 系统更新" + echo "8. restore - 恢复软件包" + echo "9. enhancement - 实用增强" echo "0. Exit - 退出" echo "----------------------------------------------------------" echo -n "请输入数字并回车(Please enter your choice): " @@ -1022,7 +1022,7 @@ catwrt_opkg_list_installed(){ fi backup_installed_packages() { - echo "正在备份名单中已安装软件包列表..." + echo "名单中已安装软件包列表..." > "$BACKUP_FILE" for package in "${PACKAGES[@]}"; do if opkg list_installed | grep -q "^$package "; then From ec4231287442f117ffeeea110f0e806fdf064499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:44:55 +0800 Subject: [PATCH 10/13] Update cattools.sh --- cattools.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cattools.sh b/cattools.sh index 30aeb0c..e6b342e 100644 --- a/cattools.sh +++ b/cattools.sh @@ -850,13 +850,6 @@ sysupgrade(){ else firmware_url=$AMD64_BIOS_SYSUP fi - - if [ -f /etc/catwrt_opkg_list_installed ]; then - rm /etc/catwrt_opkg_list_installed - fi - - catwrt_opkg_list_installed - echo "已经生成备份软件包列表，方便你后续更新后恢复部分消失的插件和软件" echo "" echo "Warning:" From 935eb9c8f4d5a95a376393cfea3e18f7599972f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:46:03 +0800 Subject: [PATCH 11/13] Update cattools.sh --- cattools.sh | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/cattools.sh b/cattools.sh index e6b342e..e3813ad 100644 --- a/cattools.sh +++ b/cattools.sh @@ -1483,41 +1483,7 @@ while true; do menu read choice case $choice in - 1) - setip - ;; - 2) - network_wizard - ;; - 3) - debug - ;; - 4) - catwrt_update - ;; - 5) - apply_repo - ;; - 6) - catnd - ;; - 7) - sysupgrade - ;; - 8) - catwrt_opkg_list_installed - ;; - 9) - enhancement_menu - ;; - 0) - echo "Exiting..." - break - ;; - *) - echo "Invalid choice, please try again" - read -p "Press [Enter] key to continue..." - ;; + esac done From 6ae06061b8583e671528c0fb90b636f5de166918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:46:35 +0800 Subject: [PATCH 12/13] Update cattools.sh --- cattools.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cattools.sh b/cattools.sh index e3813ad..c2c03f4 100644 --- a/cattools.sh +++ b/cattools.sh @@ -1483,7 +1483,6 @@ while true; do menu read choice case $choice in - esac done From 566b1738cc31917106440a37aae8831db8871d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BA=8C?= <66155308+miaoermua@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:47:50 +0800 Subject: [PATCH 13/13] Update cattools.sh --- cattools.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/cattools.sh b/cattools.sh index c2c03f4..e6b342e 100644 --- a/cattools.sh +++ b/cattools.sh @@ -1483,6 +1483,41 @@ while true; do menu read choice case $choice in + 1) + setip + ;; + 2) + network_wizard + ;; + 3) + debug + ;; + 4) + catwrt_update + ;; + 5) + apply_repo + ;; + 6) + catnd + ;; + 7) + sysupgrade + ;; + 8) + catwrt_opkg_list_installed + ;; + 9) + enhancement_menu + ;; + 0) + echo "Exiting..." + break + ;; + *) + echo "Invalid choice, please try again" + read -p "Press [Enter] key to continue..." + ;; esac done