bump version to 3.5

Update iSH-Tools to version 3.5
- Change license to GPL 3.0
- Correct SSH service startup message to display active port
- Fix issue causing mirror site to be unavailable

Author: lurenJBD

README.md

@@ -85,6 +85,20 @@ iSH-Tools主要用于在iSH快捷方便地安装管理SSH和VNC，同时还提
 > 比如 支持跳过网络检查，地区检查等<br/>
 </details>
 
+<details>
+<summary> 2025-09-14  |  3.5 更新日志 </summary>
+  
+> 优化：<br/>
+> 1. SSH服务启动信息端口现在会读取配置文件，显示正在使用的端口，不再写死8022<br/>
+> 
+> 修复：<br/>
+> 1. 修改镜像站地址为 https://ghproxy.net<br/>
+> 
+> 其他变更：<br/>
+> 1. 修改 License 为 GPL 3.0<br/>
+> 
+</details>
+
 # 脚本主要功能
 
 - 交互式安装配置VNC服务和SSH服务

iSH-Tools-CN.sh

@@ -4,18 +4,18 @@
 # coremark https://github.com/eembc/coremark
 # cpuid2cpuflags https://github.com/projg2/cpuid2cpuflags
 # coremark参考成绩来自：https://www.bilibili.com/read/cv21181867
-# Moded by lurenJBD 2024.07.15
-# iSH-Tools by lurenJBD 2020.10.17
+# iSH-Tools by lurenJBD 2020-10-17
+# Moded by lurenJBD 2025-09-14
 
 ########### Variable ###########
-tools_version="3.4"
+tools_version="3.5"
 inite_repo="wget ncurses openrc bash"
 error_times=0
 
 HOST="${HOST:="www.baidu.com"}" # 网络检测 ping 的域名
 NAMESERVER="${NAMESERVER:="223.5.5.5"}" # 当遇到域名解析故障时替换的DNS服务器
 Github_Url="${Github_Url:="https://github.com"}"
-Mirror_Url="${Mirror_Url:="https://mirror.ghproxy.com/https://github.com"}" # 默认使用的Github镜像
+Mirror_Url="${Mirror_Url:="https://ghproxy.net/https://github.com"}" # 默认使用的Github镜像
 Mirror_Repo="${Mirror_Repo:="http://mirrors.tuna.tsinghua.edu.cn"}" # 默认替换的镜像源链接
 Bypass_Check="${Bypass_Check:=0}" # 1：跳过网络&地区检查 Net：只跳过网络检查 Loc：只跳过地区检查
 Dev_Mode="${Dev_Mode:=0}" # 允许运行在非iSH下的Alpine
@@ -81,7 +81,7 @@ init_run() {
             printf "\r\033[K\033[A" && printf_tips info "检测到第一次运行脚本，正在初始化..."
         fi
         if [ "$Timeout_or_not" = 0 ]; then
-            # 当进入开发者模式不应该修改 openrc启动项，会导致正常的Alpine无法启动
+            # 当进入开发者模式不应该修改openrc启动项，会导致正常的Alpine无法启动
             [[ $Dev_Mode -eq 0 ]] && sed -i "s#::sysinit:/sbin/openrc sysinit#::sysinit:/sbin/openrc#g" /etc/inittab
             echo inited_version=\"$tools_version\" >>/etc/iSH-Tools/tools_inited
             echo inited_repo=\"$inite_repo\" >>/etc/iSH-Tools/tools_inited
@@ -157,7 +157,7 @@ check_location() {
         esac
         if [ "$user_choice" = "y" ] || [ "$user_choice" = "a" ]; then
             rm -rf /etc/apk/repositories 
-            [ "$user_choice" = "a" ] && rm -rf /ish # 不让iSH自动恢复为原本的源
+            [ "$user_choice" = "a" ] && rm -rf /ish
             echo "# Generated by iSH-Tools, choose to use the 默认源" >>/etc/apk/repositories
             echo "${Mirror_Repo}/alpine/${alpine_version}/main" >> /etc/apk/repositories
             echo "${Mirror_Repo}/alpine/${alpine_version}/community" >> /etc/apk/repositories
@@ -408,7 +408,7 @@ error_tips() {
     [ $error_times -ge 10 ] && $echo_ERROR "已累计出现${error_times}次错误，脚本已退出" && exit 1
 } 
 
-# X-org配置初始化
+# Xorg配置初始化
 xinit_vnc() {
     [ ! -e /etc/X11/xorg.conf.d ] && mkdir -p /etc/X11/xorg.conf.d
     if [ ! -e /etc/X11/xorg.conf.d/10-headless.conf ]; then
@@ -686,9 +686,8 @@ run_tools() {
                 "${tools_dir}/coremark/$file" 0x0 0x0 0x66 0 7 1 2000 > "${tools_dir}/coremark/logs/$file.log"
                 score=$(cat "${tools_dir}/coremark/logs/$file.log" | grep "CoreMark 1.0" | awk '{print $4}')
                 formatted_score=$(printf "%.1f" "$score")
-                printf '\033[A\r\033[K' # 光标回到上一行，并清除该行内容
+                printf '\033[A\r\033[K'
                 printf "${CYAN}%-7s${PLAIN} ${YELLOW}%-8s${PLAIN} %-9s \n" "INFO" "${name}线程" "得分：$formatted_score"
-                # 倒计时显示效果器
                 if [ "$num" -lt 8 ]; then
                 wait_time=(5 + 1)
                 start_time=$(date +%s)
@@ -698,7 +697,7 @@ run_tools() {
                     printf '设备散热中，等待 %s 秒\r' "$(( --c ))"
                     sleep 1
                 done
-                printf '\r\033[K' # 清除该行的内容
+                printf '\r\033[K'
                 tput cnorm
                 fi
             fi
@@ -940,7 +939,8 @@ config_vnc_resolution() {
 # 配置服务启动
 config_services_boot() {
     local_ip=$(/etc/iSH-Tools/get_local_ip 2>/dev/null) || local_ip='<设备IP>'
-    local notes="${services}服务已经启动，请用${services}客户端访问 \${local_ip}:${services_port}"
+    local services_lower=$(echo "$services" | tr 'A-Z' 'a-z')
+    local notes="${services}服务已经启动，请用${services}客户端访问 \${local_ip}:\${${services_lower}_port:-$services_port}"
     enable_color=(0 1 1)
     menu_color=("1"); menu_action=("1"); do_service=("1"); pnum=24
 
@@ -993,6 +993,7 @@ config_services_boot() {
 				export PS1="\u@\h:\w\# "
 				echo_INFO="echo -e \033[0;36mINFO\033[0m"
 				local_ip=\$(/etc/iSH-Tools/get_local_ip 2>/dev/null) || local_ip='<设备IP>'
+				ssh_port=\$(grep -E '^[^#]*Port[[:space:]]+[0-9]+' /etc/ssh/sshd_config | tail -n1 | awk '{print \$2}')
 				EOF
                 source /root/.profile
                 fi

iSH-Tools-Setup-CN.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
-# Moded by lurenJBD 2024.07.09
-# iSH-Tools by lurenJBD 2020.10.17
+# iSH-Tools by lurenJBD 2020-10-17
+# Moded by lurenJBD 2025-09-14
 
 ########### Variable ###########
 HOST="${HOST:="www.baidu.com"}"
 NAMESERVER="${NAMESERVER:="223.5.5.5"}"
 Github_Url="${Github_Url:="https://github.com"}"
-Mirror_Url="${Mirror_Url:="https://mirror.ghproxy.com/https://github.com"}"
+Mirror_Url="${Mirror_Url:="https://ghproxy.net/https://github.com"}"
 Mirror_Repo="${Mirror_Repo:="http://mirrors.tuna.tsinghua.edu.cn"}" # 默认替换的镜像源链接
 Bypass_Check="${Bypass_Check:=0}" # 1：跳过网络&地区检查 Net：只跳过网络检查 Loc：只跳过地区检查
 
@@ -236,4 +236,4 @@ run_main() {
 }
 
 ########### Main ###########
-run_main
+run_main