gtAdmin/CatTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: soft channel

Browse Source
This commit is contained in:
timochan
2024-07-15 22:19:05 +08:00
parent f9277d801d
commit 3788d3d92c
1 changed files with 369 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

523
cattools.sh
View File

@@ -13,7 +13,7 @@ if [ $(id -u) != "0" ]; then
fi
openwrt_release=$(cat /etc/openwrt_release)
if ! grep -q "OpenWrt" <<< "$openwrt_release"; then
if ! grep -q "OpenWrt" <<<"$openwrt_release"; then
echo "Your system is not supported!"
exit 1
fi
@@ -92,11 +92,14 @@ skip_update=false
while [[ "$#" -gt 0 ]]; do
case $1 in
-h) help ;;
-help) help ;;
-u) skip_update=true ;;
-update) skip_update=true ;;
*) echo "Unknown parameter passed: $1"; exit 1 ;;
-h) help ;;
-help) help ;;
-u) skip_update=true ;;
-update) skip_update=true ;;
*)
echo "Unknown parameter passed: $1"
exit 1
;;
esac
shift
done
@@ -106,7 +109,7 @@ if [ "$skip_update" = false ]; then
fi
# Setup
setip(){
setip() {
DEFAULT_IP="192.168.1.4"
while true; do
read -p "Please enter the IP Addr and press Enter /// 请输入 IP (默认为 $DEFAULT_IP): " input_ip
@@ -114,7 +117,7 @@ setip(){
input_ip=$DEFAULT_IP
fi
if echo "$input_ip" | grep -Eo '^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$' > /dev/null; then
if echo "$input_ip" | grep -Eo '^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$' >/dev/null; then
break
else
echo "Invalid IP address format /// 非法的 IP 地址格式，请重新输入"
@@ -267,7 +270,6 @@ network_wizard() {
uci set network.lan._orig_ifname="$bridge_ports"
uci set network.lan._orig_bridge='true'
echo "Network interfaces configured: WAN (eth0), LAN ($bridge_ports) /// 网口已配置: WAN (eth0), LAN ($bridge_ports)"
fi
else
@@ -384,76 +386,76 @@ debug() {
rm /www/logs.txt
fi
cat /etc/banner >> /www/logs.txt
date >> /www/logs.txt
cat /etc/banner >>/www/logs.txt
date >>/www/logs.txt
echo "## RELEASE" >> /www/logs.txt
echo "==========" >> /www/logs.txt
cat /etc/catwrt_release >> /www/logs.txt
echo "## RELEASE" >>/www/logs.txt
echo "==========" >>/www/logs.txt
cat /etc/catwrt_release >>/www/logs.txt
echo ""
echo "## STATUS" >> /www/logs.txt
echo "=================" >> /www/logs.txt
eval $UPTIME >> /www/logs.txt
echo "## STATUS" >>/www/logs.txt
echo "=================" >>/www/logs.txt
eval $UPTIME >>/www/logs.txt
echo ""
echo "## Memory Usage" >> /www/logs.txt
echo "==========" >> /www/logs.txt
free -h >> /www/logs.txt
echo "## Memory Usage" >>/www/logs.txt
echo "==========" >>/www/logs.txt
free -h >>/www/logs.txt
echo ""
echo "## Disk Usage" >> /www/logs.txt
echo "==========" >> /www/logs.txt
df -h >> /www/logs.txt
echo "## Disk Usage" >>/www/logs.txt
echo "==========" >>/www/logs.txt
df -h >>/www/logs.txt
echo ""
echo "## Application" >> /www/logs.txt
echo "==========" >> /www/logs.txt
opkg list_installed >> /www/logs.txt
echo "## Application" >>/www/logs.txt
echo "==========" >>/www/logs.txt
opkg list_installed >>/www/logs.txt
echo "## SYSLOG" >> /www/logs.txt
echo "==========" >> /www/logs.txt
logread >> /www/logs.txt
echo "## SYSLOG" >>/www/logs.txt
echo "==========" >>/www/logs.txt
logread >>/www/logs.txt
echo ""
echo "## DMESG" >> /www/logs.txt
echo "==========" >> /www/logs.txt
dmesg >> /www/logs.txt
echo "## DMESG" >>/www/logs.txt
echo "==========" >>/www/logs.txt
dmesg >>/www/logs.txt
echo ""
echo "## Plugins" >> /www/logs.txt
echo "==========" >> /www/logs.txt
cat /tmp/openclash.log >> /www/logs.txt
cat /tmp/log/ssrplus.log >> /www/logs.txt
cat /tmp/log/passwall.log >> /www/logs.txt
cat /tmp/log/passwall2.log >> /www/logs.txt
echo "## Plugins" >>/www/logs.txt
echo "==========" >>/www/logs.txt
cat /tmp/openclash.log >>/www/logs.txt
cat /tmp/log/ssrplus.log >>/www/logs.txt
cat /tmp/log/passwall.log >>/www/logs.txt
cat /tmp/log/passwall2.log >>/www/logs.txt
echo ""
echo "## Task" >> /www/logs.txt
echo "==========" >> /www/logs.txt
top -b -n 1 >> /www/logs.txt
echo "## Task" >>/www/logs.txt
echo "==========" >>/www/logs.txt
top -b -n 1 >>/www/logs.txt
echo ""
echo "## Network Configuration" >> /www/logs.txt
echo "==========" >> /www/logs.txt
ifconfig -a >> /www/logs.txt
echo "## Network Configuration" >>/www/logs.txt
echo "==========" >>/www/logs.txt
ifconfig -a >>/www/logs.txt
echo ""
echo "## UCI Network" >> /www/logs.txt
echo "==========" >> /www/logs.txt
uci show network >> /www/logs.txt
echo "## UCI Network" >>/www/logs.txt
echo "==========" >>/www/logs.txt
uci show network >>/www/logs.txt
echo ""
echo "## Firewall" >> /www/logs.txt
echo "==========" >> /www/logs.txt
iptables -L -v -n >> /www/logs.txt
ip6tables -L -v -n >> /www/logs.txt
echo "## Firewall" >>/www/logs.txt
echo "==========" >>/www/logs.txt
iptables -L -v -n >>/www/logs.txt
ip6tables -L -v -n >>/www/logs.txt
echo ""
echo "## Routing Table" >> /www/logs.txt
echo "==========" >> /www/logs.txt
ip route >> /www/logs.txt
ip -6 route >> /www/logs.txt
echo "## Routing Table" >>/www/logs.txt
echo "==========" >>/www/logs.txt
ip route >>/www/logs.txt
ip -6 route >>/www/logs.txt
echo ""
lan_ip=$(uci get network.lan.ipaddr)
@@ -484,6 +486,7 @@ catwrt_update() {
arch_self=$1
version_remote=$(curl -s "$API_URL" | jq -r ".$arch_self.version")
hash_remote=$(curl -s "$API_URL" | jq -r ".$arch_self.hash")
channel_remote=$(curl -s "$API_URL" | jq -r ".$arch_self.channel")
if [ $? -ne 0 ] || [ -z "$version_remote" ] || [ -z "$hash_remote" ]; then
remote_error "version or hash"
@@ -504,7 +507,7 @@ catwrt_update() {
contrast_version() {
if [ "$version_remote" == "$version_local" ] && [ "$hash_remote" == "$hash_local" ]; then
echo "======================================================="
echo " Your CatWrt is up to date!"
echo " Your CatWrt is up to date! Also, you are using $channel_remote channel."
echo "======================================================="
else
echo "======================================================="
@@ -516,10 +519,12 @@ catwrt_update() {
}
print_version() {
echo "Local Version : $version_local"
echo "Remote Version : $version_remote"
echo "Local Hash : $hash_local"
echo "Remote Hash : $hash_remote"
echo "Remote Version : $version_remote"
echo "Source Channel : $channel_remote"
echo "Local Version : $version_local"
echo "Local Hash : $hash_local"
echo "======================================================="
echo ""
}
@@ -531,7 +536,7 @@ catwrt_update() {
print_version
}
main
}
}
# Repo
apply_repo() {
@@ -543,32 +548,32 @@ apply_repo() {
openwrt_version=$(grep DISTRIB_RELEASE /etc/openwrt_release | cut -d"'" -f2)
arch=$(grep DISTRIB_TARGET /etc/openwrt_release | cut -d"/" -f1)
case "$arch" in
x86_64)
if grep -q "R22.11.11" /etc/openwrt_release; then
version="v22.12"
elif grep -q "R23.2" /etc/openwrt_release; then
version="v23.2"
else
echo "Unknown arch x86_64 /// 未知的 x86_64 版本"
exit 1
fi
;;
aarch64_generic)
if grep -q "R22.12.1" /etc/openwrt_release; then
version="v22.12"
arch="rkarm"
else
echo "Unknown arch aarch64_generic ///未知的 aarch64_generic 版本"
exit 1
fi
;;
*)
echo "Unknown arch $arch /// 未知的架构: $arch"
x86_64)
if grep -q "R22.11.11" /etc/openwrt_release; then
version="v22.12"
elif grep -q "R23.2" /etc/openwrt_release; then
version="v23.2"
else
echo "Unknown arch x86_64 /// 未知的 x86_64 版本"
exit 1
;;
fi
;;
aarch64_generic)
if grep -q "R22.12.1" /etc/openwrt_release; then
version="v22.12"
arch="rkarm"
else
echo "Unknown arch aarch64_generic ///未知的 aarch64_generic 版本"
exit 1
fi
;;
*)
echo "Unknown arch $arch /// 未知的架构: $arch"
exit 1
;;
esac
else
echo "`/etc/catwrt_release` or `/etc/openwrt_release` Files do not exist /// 文件不存在或者系统损坏!"
echo "$(/etc/catwrt_release) or $(/etc/openwrt_release) Files do not exist /// 文件不存在或者系统损坏!"
exit 1
fi
fi
@@ -577,56 +582,56 @@ apply_repo() {
select_repo() {
case "$arch" in
amd64)
if [ "$version" == "v23.8" ]; then
REPO_URL="$BASE_URL/amd64"
elif [ "$version" == "v22.12" ]; then
REPO_URL="$BASE_URL/history/v22.12/amd64"
elif [ "$version" == "v23.2" ]; then
REPO_URL="$BASE_URL/history/v23.2/amd64"
elif [ "$version" == "v24.3" ]; then
REPO_URL="$BASE_URL/amd64"
elif [ "$version" == "v24.8" ]; then
REPO_URL="$BASE_URL/amd64"
else
echo "Unknown arch $arch /// 未知的架构: $arch"
exit 1
fi
;;
mt798x)
if [ "$version" == "v23.8" ]; then
REPO_URL="$BASE_URL/mt798x"
elif [ "$version" == "v22.12" ]; then
REPO_URL="$BASE_URL/history/v22.12/aarch64_cortex-a53"
elif [ "$version" == "v23.2" ]; then
REPO_URL="$BASE_URL/history/v23.2/mt7986a"
else
echo "Unknown arch mt798x /// 未知的 mt798x 版本"
exit 1
fi
;;
rkarm)
if [ "$version" == "v22.12" ]; then
REPO_URL="$BASE_URL/rkarm"
else
echo "Unknown arch rkarm /// 未知的 rkarm 版本"
exit 1
fi
;;
*)
amd64)
if [ "$version" == "v23.8" ]; then
REPO_URL="$BASE_URL/amd64"
elif [ "$version" == "v22.12" ]; then
REPO_URL="$BASE_URL/history/v22.12/amd64"
elif [ "$version" == "v23.2" ]; then
REPO_URL="$BASE_URL/history/v23.2/amd64"
elif [ "$version" == "v24.3" ]; then
REPO_URL="$BASE_URL/amd64"
elif [ "$version" == "v24.8" ]; then
REPO_URL="$BASE_URL/amd64"
else
echo "Unknown arch $arch /// 未知的架构: $arch"
exit 1
;;
fi
;;
mt798x)
if [ "$version" == "v23.8" ]; then
REPO_URL="$BASE_URL/mt798x"
elif [ "$version" == "v22.12" ]; then
REPO_URL="$BASE_URL/history/v22.12/aarch64_cortex-a53"
elif [ "$version" == "v23.2" ]; then
REPO_URL="$BASE_URL/history/v23.2/mt7986a"
else
echo "Unknown arch mt798x /// 未知的 mt798x 版本"
exit 1
fi
;;
rkarm)
if [ "$version" == "v22.12" ]; then
REPO_URL="$BASE_URL/rkarm"
else
echo "Unknown arch rkarm /// 未知的 rkarm 版本"
exit 1
fi
;;
*)
echo "Unknown arch $arch /// 未知的架构: $arch"
exit 1
;;
esac
}
echo ""
echo "Warning:"
echo "软件源纯属免费分享，赞助我们复制链接在浏览器打开，这对我们继续保持在线服务有很大影响。"
echo "本人不对所有软件进行保证，我们没有第三方商业服务，风险需要自行承担。"
echo "支持我们: https://www.miaoer.xyz/sponsor"
echo "你需要同意 CatWrt 软件源用户协议,请确认是否继续 (10 秒内按 [Ctrl]+[C] 取消操作)"
echo "=============================================================================="
echo ""
echo "Warning:"
echo "软件源纯属免费分享，赞助我们复制链接在浏览器打开，这对我们继续保持在线服务有很大影响。"
echo "本人不对所有软件进行保证，我们没有第三方商业服务，风险需要自行承担。"
echo "支持我们: https://www.miaoer.xyz/sponsor"
echo "你需要同意 CatWrt 软件源用户协议,请确认是否继续 (10 秒内按 [Ctrl]+[C] 取消操作)"
echo "=============================================================================="
select_repo
@@ -642,12 +647,12 @@ apply_repo() {
choice=${choice:-5}
case $choice in
1) conf_file="distfeeds.conf";;
2) conf_file="cfnetlify.conf";;
3) conf_file="netlify.conf";;
4) conf_file="cfvercel.conf";;
5) conf_file="vercel.conf";;
*) conf_file="vercel.conf";;
1) conf_file="distfeeds.conf" ;;
2) conf_file="cfnetlify.conf" ;;
3) conf_file="netlify.conf" ;;
4) conf_file="cfvercel.conf" ;;
5) conf_file="vercel.conf" ;;
*) conf_file="vercel.conf" ;;
esac
CONF_PATH="$REPO_URL/$conf_file"
@@ -671,17 +676,17 @@ apply_repo() {
}
# catnd
catnd(){
catnd() {
echo "$(date) - Starting CatWrt Network Diagnostics"
echo " "
# Ping & PPPoE
ping -c 3 223.5.5.5 > /dev/null
ping -c 3 223.5.5.5 >/dev/null
if [ $? -eq 0 ]; then
echo "[Ping] Network connection succeeded!"
echo " "
else
ping -c 3 119.29.29.99 > /dev/null
ping -c 3 119.29.29.99 >/dev/null
if [ $? -eq 0 ]; then
echo "[Ping] Network connection succeeded,But there may be problems!"
echo " "
@@ -702,11 +707,11 @@ catnd(){
dns_servers=$(echo $dns_config | awk -F "'" '{print $2}')
for ip in $dns_servers; do
if ! [[ $valid_dns =~ (^|[ ])$ip($|[ ]) ]]; then
echo "[DNS] Recommended to delete DNS $ip"
echo " "
exit 1
fi
if ! [[ $valid_dns =~ (^|[ ])$ip($|[ ]) ]]; then
echo "[DNS] Recommended to delete DNS $ip"
echo " "
exit 1
fi
done
# Bad DNS
@@ -715,64 +720,64 @@ catnd(){
bad_dns="114.114.114.114 114.114.115.115 119.29.29.29"
if [[ $dns_config =~ $bad_dns ]]; then
echo "[DNS] DNS may be polluted or unreliable"
echo " "
echo "[DNS] DNS may be polluted or unreliable"
echo " "
fi
# nslookup
nslookup bilibili.com > /dev/null
nslookup bilibili.com >/dev/null
if [ $? -ne 0 ]; then
nslookup www.miaoer.xyz > /dev/null
if [ $? -eq 0 ]; then
echo "[DNS] DNS resolution succeeded"
echo " "
else
echo "[DNS] NS resolution failed for 'www.miaoer.xyz'"
echo "[DNS] Your DNS server may have issues"
echo " "
fi
nslookup www.miaoer.xyz >/dev/null
if [ $? -eq 0 ]; then
echo "[DNS] DNS resolution succeeded"
echo " "
else
echo "[DNS] NS resolution failed for 'www.miaoer.xyz'"
echo "[DNS] Your DNS server may have issues"
echo " "
fi
fi
# Public IP
echo CatWrt IPv4 Addr: $(curl --silent --connect-timeout 5 4.ipw.cn )
echo CatWrt IPv4 Addr: $(curl --silent --connect-timeout 5 4.ipw.cn)
echo " "
curl 6.ipw.cn --connect-timeout 5 > /dev/null 2>&1
curl 6.ipw.cn --connect-timeout 5 >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "[IPv6] IPv6 network connection timed out"
echo " "
echo "[IPv6] IPv6 network connection timed out"
echo " "
else
echo CatWrt IPv6 Addr: $(curl --silent 6.ipw.cn)
echo " "
echo CatWrt IPv6 Addr: $(curl --silent 6.ipw.cn)
echo " "
fi
# IPv6
resp=$(curl --silent test.ipw.cn)
if echo "$resp" | grep -q -E '240e|2408|2409|2401'; then
echo "[IPv6] IPv6 access is preferred"
echo " "
echo "[IPv6] IPv6 access is preferred"
echo " "
else
echo "[IPv6] IPv4 access is preferred"
echo " "
echo "[IPv6] IPv4 access is preferred"
echo " "
fi
# Default IP
ipaddr_config=$(grep '192.168.1.4' /etc/config/network)
if [ -z "$ipaddr_config" ]; then
echo "[Default-IP] address is not the catwrt default 192.168.1.4"
echo "Please configure your network at 'https://www.miaoer.xyz/posts/network/quickstart-catwrt'"
echo " "
echo "[Default-IP] address is not the catwrt default 192.168.1.4"
echo "Please configure your network at 'https://www.miaoer.xyz/posts/network/quickstart-catwrt'"
echo " "
fi
# Bypass Gateway
wan_config=$(grep 'config interface' /etc/config/network | grep 'wan')
if [ -z "$wan_config" ]; then
echo "[Bypass Gateway] No config for 'wan' interface found in /etc/config/network"
echo "Please check if your device is set as a Bypass Gateway"
echo " "
echo "[Bypass Gateway] No config for 'wan' interface found in /etc/config/network"
echo "Please check if your device is set as a Bypass Gateway"
echo " "
fi
# Rotuer Mode(PPPoE)
@@ -790,16 +795,16 @@ catnd(){
fi
# IPv6 WAN6
grep 'config interface' /etc/config/network | grep 'wan6' > /dev/null
grep 'config interface' /etc/config/network | grep 'wan6' >/dev/null
if [ $? -ne 0 ]; then
echo "[wan6] Your IPv6 network may have issues"
echo " "
echo "[wan6] Your IPv6 network may have issues"
echo " "
fi
grep 'dhcpv6' /etc/config/network > /dev/null
grep 'dhcpv6' /etc/config/network >/dev/null
if [ $? -ne 0 ]; then
echo "[wan6] Your IPv6 network may have issues"
echo " "
echo "[wan6] Your IPv6 network may have issues"
echo " "
fi
# Tcping
@@ -824,7 +829,7 @@ catnd(){
}
# Sysupgrade
sysupgrade(){
sysupgrade() {
if [ "$(uname -m)" != "x86_64" ]; then
echo "仅有 x86_64 可以使用脚本进行系统升级。"
exit 1
@@ -833,7 +838,7 @@ sysupgrade(){
echo ""
disk_size=$(fdisk -l /dev/sda | grep "Disk /dev/sda:" | awk '{print $3}')
if (( $(echo "$disk_size != 800.28" | bc -l) )); then
if (($(echo "$disk_size != 800.28" | bc -l))); then
echo "磁盘空间未修改或不匹配，无法继续升级。"
exit 1
fi
@@ -900,14 +905,14 @@ enhancement_menu() {
echo
read -p "请输入数字并回车(Please enter your choice): " choice
case $choice in
1) configure_luci_mihomo ;;
2) configure_tailscale ;;
3) configure_ttyd ;;
4) manual_deploy_uhttpd_ssl_cert ;;
5) openwrt_firstboot ;;
6) reset_root_password ;;
0) menu ;;
*) echo "无效选项，请重试" && enhancement_menu ;;
1) configure_luci_mihomo ;;
2) configure_tailscale ;;
3) configure_ttyd ;;
4) manual_deploy_uhttpd_ssl_cert ;;
5) openwrt_firstboot ;;
6) reset_root_password ;;
0) menu ;;
*) echo "无效选项，请重试" && enhancement_menu ;;
esac
}
@@ -919,16 +924,16 @@ configure_luci_mihomo() {
arch=$(uname -m)
case "$arch" in
"x86_64")
arch="amd64"
;;
"aarch64")
arch="arm64"
;;
*)
echo "[ERROR] 不支持的架构: $arch"
exit 1
;;
"x86_64")
arch="amd64"
;;
"aarch64")
arch="arm64"
;;
*)
echo "[ERROR] 不支持的架构: $arch"
exit 1
;;
esac
if ! opkg list_installed | grep -q luci-app-openclash; then
@@ -1005,30 +1010,30 @@ configure_luci_mihomo() {
)
case $choice in
1)
echo "正在更新 Mihomo 内核..."
download_mihomo_core "clash_meta" "${clash_meta_urls[@]}"
echo "正在更新原版内核..."
download_mihomo_core "clash" "${clash_urls[@]}"
;;
2)
echo "正在更新 Mihomo 内核..."
download_mihomo_core "clash_meta" "${clash_meta_urls[@]}"
;;
3)
echo "正在更新原版内核..."
download_mihomo_core "clash" "${clash_urls[@]}"
;;
*)
echo "[ERROR] 无效选项"
exit 1
;;
1)
echo "正在更新 Mihomo 内核..."
download_mihomo_core "clash_meta" "${clash_meta_urls[@]}"
echo "正在更新原版内核..."
download_mihomo_core "clash" "${clash_urls[@]}"
;;
2)
echo "正在更新 Mihomo 内核..."
download_mihomo_core "clash_meta" "${clash_meta_urls[@]}"
;;
3)
echo "正在更新原版内核..."
download_mihomo_core "clash" "${clash_urls[@]}"
;;
*)
echo "[ERROR] 无效选项"
exit 1
;;
esac
echo "操作完成"
}
configure_tailscale(){
configure_tailscale() {
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]+\.[0-9]+|172\.3[0-1]\.[0-9]+\.[0-9]+"; then
echo "[ERROR] 请先配置软件源"
menu
@@ -1056,16 +1061,16 @@ configure_tailscale(){
firewall_file="/etc/firewall.user"
rules=("iptables -I FORWARD -i tailscale0 -j ACCEPT"
"iptables -I FORWARD -o tailscale0 -j ACCEPT"
"iptables -t nat -I POSTROUTING -o tailscale0 -j MASQUERADE")
"iptables -I FORWARD -o tailscale0 -j ACCEPT"
"iptables -t nat -I POSTROUTING -o tailscale0 -j MASQUERADE")
for rule in "${rules[@]}"; do
if ! grep -q "^$rule$" $firewall_file; then
echo $rule >> $firewall_file
echo $rule >>$firewall_file
fi
done
lan_ip=$(uci get network.lan.ipaddr)
lan_ip=$(uci get network.lan.ipaddr)
echo ""
echo "点击上面的 tailscale login 链接然后再进行以下配置"
@@ -1093,7 +1098,7 @@ configure_tailscale(){
}
# TTYD (NOT SAFETY)
configure_ttyd(){
configure_ttyd() {
if ! opkg list_installed | grep -q "luci-app-ttyd" || ! opkg list_installed | grep -q "ttyd"; then
echo "[ERROR]未安装 luci-app-ttyd 或 ttyd 软件包，请先配置软件源并安装这些软件包"
menu
@@ -1127,8 +1132,8 @@ configure_ttyd(){
if grep -q "option command '/bin/login -f root'" /etc/config/ttyd; then
sed -i "s/option command '\/bin\/login -f root'/option command '\/bin\/login'/" /etc/config/ttyd
/etc/init.d/ttyd restart
echo ""
echo "TTYD 配置已还原为默认配置"
echo ""
echo "TTYD 配置已还原为默认配置"
else
sed -i "s/option command '\/bin\/login'/option command '\/bin\/login -f root'/" /etc/config/ttyd
/etc/init.d/ttyd restart
@@ -1156,10 +1161,10 @@ manual_deploy_uhttpd_ssl_cert() {
return
fi
if ! grep -q "list listen_http '0.0.0.0:80'" /etc/config/uhttpd || \
! grep -q "list listen_http '\[::\]:80'" /etc/config/uhttpd || \
! grep -q "list listen_https '0.0.0.0:443'" /etc/config/uhttpd || \
! grep -q "list listen_https '\[::\]:443'" /etc/config/uhttpd; then
if ! grep -q "list listen_http '0.0.0.0:80'" /etc/config/uhttpd ||
! grep -q "list listen_http '\[::\]:80'" /etc/config/uhttpd ||
! grep -q "list listen_https '0.0.0.0:443'" /etc/config/uhttpd ||
! grep -q "list listen_https '\[::\]:443'" /etc/config/uhttpd; then
echo "[ERROR] uhttpd 配置文件中的监听端口配置已被修改，请检查!"
fi
@@ -1173,7 +1178,7 @@ manual_deploy_uhttpd_ssl_cert() {
return
fi
fi
lan_ip=$(uci get network.lan.ipaddr)
lan_ip=$(uci get network.lan.ipaddr)
echo ""
echo "请在浏览器中访问 http://$lan_ip/cgi-bin/luci/admin/system/filetransfer 上传证书 zip 文件。"
@@ -1288,38 +1293,38 @@ 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)
enhancement_menu
;;
0)
echo "Exiting..."
break
;;
*)
echo "Invalid choice, please try again"
read -p "Press [Enter] key to continue..."
;;
1)
setip
;;
2)
network_wizard
;;
3)
debug
;;
4)
catwrt_update
;;
5)
apply_repo
;;
6)
catnd
;;
7)
sysupgrade
;;
8)
enhancement_menu
;;
0)
echo "Exiting..."
break
;;
*)
echo "Invalid choice, please try again"
read -p "Press [Enter] key to continue..."
;;
esac
done