core: 不重要的优化

README.en.md

@@ -20,7 +20,7 @@ One-Click Script to Reinstall System [中文](README.md)
 - No need to input IP parameters; automatically recognizes dynamic and static IPs, supports `/32`, `/128`, `gateway outside subnet`, `IPv6 only`, `dual NIC` and other special network configurations
 - Specially optimized for low-spec servers, requires less memory than the official netboot
 - Uses partition table ID to identify hard drives throughout the process, ensuring no wrong disk is written
-- Supports BIOS and EFI boot, and ARM architecture
+- Supports BIOS and EFI boot, and ARM Server
 - No homemades image included, all resources are obtained in real-time from mirror sites
 - Includes many comments.
 
@@ -35,7 +35,7 @@ The system requirements for the target system are as follows:
 | <img width="16" height="16" src="https://www.alpinelinux.org/alpine-logo.ico" /> Alpine                                                                                                                                                                    | 3.17, 3.18, 3.19, 3.20                | 256 MB    | 1 GB                   |
 | <img width="16" height="16" src="https://www.debian.org/favicon.ico" /> Debian                                                                                                                                                                             | 9, 10, 11, 12                         | 256 MB    | 1 ~ 1.5 GB ^           |
 | <img width="16" height="16" src="https://github.com/bin456789/reinstall/assets/7548515/f74b3d5b-085f-4df3-bcc9-8a9bd80bb16d" /> Kali                                                                                                                       | Rolling                               | 256 MB    | 1 ~ 1.5 GB ^           |
-| <img width="16" height="16" src="https://netplan.readthedocs.io/en/latest/_static/favicon.png" /> Ubuntu                                                                                                                                                   | 16.04, 18.04, 20.04, 22.04, 24.04     | 512 MB \* | 2 GB                   |
+| <img width="16" height="16" src="https://canonical-subiquity.readthedocs-hosted.com/en/latest/_static/favicon.png" /> Ubuntu                                                                                                                               | 16.04, 18.04, 20.04, 22.04, 24.04     | 512 MB \* | 2 GB                   |
 | <img width="16" height="16" src="https://www.centos.org/assets/img/favicon.png" /> CentOS                                                                                                                                                                  | 9                                     | 512 MB \* | 5 GB                   |
 | <img width="16" height="16" src="https://img.alicdn.com/imgextra/i1/O1CN01oJnJZg1yK4RzI4Rx2_!!6000000006559-2-tps-118-118.png" /> Anolis                                                                                                                   | 7, 8                                  | 512 MB \* | 5 GB                   |
 | <img width="16" height="16" src="https://www.redhat.com/favicon.ico" /> RedHat &nbsp; <img width="16" height="16" src="https://almalinux.org/fav/favicon.ico" /> Alma &nbsp; <img width="16" height="16" src="https://rockylinux.org/favicon.png" /> Rocky | 8, 9                                  | 512 MB \* | 5 GB                   |
@@ -428,7 +428,7 @@ Log in to the server using Remote Desktop, open Device Manager, locate the graph
 [![GitHub Issues](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)](https://github.com/bin456789/reinstall/issues)
 [![Telegram Group](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/reinstall_os)
 
-## How to Modify the Script for your own
+## How to Modify the Script for Your Own
 
 1. Fork this repository.
 2. Modify the `confhome` and `confhome_cn` at the beginning of `reinstall.sh` and `reinstall.bat`.

README.md

@@ -14,13 +14,13 @@
 
 ## 亮点
 
-- 支持一键安装 Linux，可安装 17 种常见发行版
+- 一键安装 Linux，支持 17 种常见发行版
-- 支持一键安装 Windows，使用官方 ISO 安装而非自制镜像，脚本会自动获取 ISO 链接、自动安装 Virtio 等驱动
+- 一键安装 Windows，使用官方 ISO 安装而非自制镜像，脚本会自动获取 ISO 链接、自动安装 Virtio 等驱动
 - 支持任意方向重装，即 `Linux to Linux`、`Linux to Windows`、`Windows to Windows`、`Windows to Linux`
 - 无需填写 IP 参数，自动识别动静态，支持 `/32`、`/128`、`网关不在子网范围内`、`纯 IPv6`、`双网卡` 等特殊网络
 - 专门适配低配小鸡，比官方 netboot 需要更少的内存
 - 全程用分区表 ID 识别硬盘，确保不会写错硬盘
-- 支持 BIOS、EFI 引导，支持 ARM
+- 支持 BIOS、EFI 引导，支持 ARM 服务器
 - 不含自制包，所有资源均实时从镜像源获得
 - 有很多注释
 
@@ -35,7 +35,7 @@
 | <img width="16" height="16" src="https://www.alpinelinux.org/alpine-logo.ico" /> Alpine                                                                                                                                                                    | 3.17, 3.18, 3.19, 3.20                | 256 MB    | 1 GB         |
 | <img width="16" height="16" src="https://www.debian.org/favicon.ico" /> Debian                                                                                                                                                                             | 9, 10, 11, 12                         | 256 MB    | 1 ~ 1.5 GB ^ |
 | <img width="16" height="16" src="https://github.com/bin456789/reinstall/assets/7548515/f74b3d5b-085f-4df3-bcc9-8a9bd80bb16d" /> Kali                                                                                                                       | 滚动                                  | 256 MB    | 1 ~ 1.5 GB ^ |
-| <img width="16" height="16" src="https://netplan.readthedocs.io/en/latest/_static/favicon.png" /> Ubuntu                                                                                                                                                   | 16.04, 18.04, 20.04, 22.04, 24.04     | 512 MB \* | 2 GB         |
+| <img width="16" height="16" src="https://canonical-subiquity.readthedocs-hosted.com/en/latest/_static/favicon.png" /> Ubuntu                                                                                                                               | 16.04, 18.04, 20.04, 22.04, 24.04     | 512 MB \* | 2 GB         |
 | <img width="16" height="16" src="https://www.centos.org/assets/img/favicon.png" /> CentOS                                                                                                                                                                  | 9                                     | 512 MB \* | 5 GB         |
 | <img width="16" height="16" src="https://img.alicdn.com/imgextra/i1/O1CN01oJnJZg1yK4RzI4Rx2_!!6000000006559-2-tps-118-118.png" /> Anolis                                                                                                                   | 7, 8                                  | 512 MB \* | 5 GB         |
 | <img width="16" height="16" src="https://www.redhat.com/favicon.ico" /> RedHat &nbsp; <img width="16" height="16" src="https://almalinux.org/fav/favicon.ico" /> Alma &nbsp; <img width="16" height="16" src="https://rockylinux.org/favicon.png" /> Rocky | 8, 9                                  | 512 MB \* | 5 GB         |

reinstall.bat

@@ -137,9 +137,7 @@ for /f %%a in ('%SystemDrive%\cygwin\bin\cygpath -ua ./') do set thisdir=%%a
 
 rem 下载 reinstall.sh
 if not exist reinstall.sh (
-    rem call :download %confhome%/reinstall.sh %~dp0reinstall.sh
+    call :download_with_curl %confhome%/reinstall.sh %thisdir%reinstall.sh || goto :download_failed
-    call :download_with_curl %confhome%/reinstall.sh %thisdir%reinstall.sh
-    if errorlevel 1 goto :download_failed
     call :chmod a+x %thisdir%reinstall.sh
 )
 
@@ -163,6 +161,7 @@ exit /b
 
 :download
 rem bits 要求有 Content-Length 才能下载
+rem 据说如果网络设为“按流量计费” bits 也无法下载
 rem https://learn.microsoft.com/en-us/windows/win32/bits/http-requirements-for-bits-downloads
 rem certutil 会被 windows Defender 报毒
 rem windows server 2019 要用第二条 certutil 命令
@@ -175,8 +174,12 @@ if not exist "%~2" exit /b 1
 exit /b
 
 :download_with_curl
+rem 加 --insecure 防止以下错误
+rem curl: (77) error setting certificate verify locations:
+rem   CAfile: /etc/ssl/certs/ca-certificates.crt
+rem   CApath: none
 echo Download: %~1 %~2
-%SystemDrive%\cygwin\bin\curl -L "%~1" -o "%~2"
+%SystemDrive%\cygwin\bin\curl -L --insecure "%~1" -o "%~2"
 exit /b
 
 :chmod

windows-change-rdp-port.bat

@@ -41,7 +41,7 @@ rem 重启服务 可以用 sc 或者 net
 rem UmRdpService 依赖 TermService
 rem sc stop 不能处理依赖关系，因此 sc stop TermService 前需要 sc stop UmRdpService
 rem net stop 可以处理依赖关系
-rem sc stop 是异步的，rem net stop 不是异步，但有 timeout 时间
+rem sc stop 是异步的，net stop 不是异步，但有 timeout 时间
 rem TermService 运行后，UmRdpService 会自动运行
 
 rem 如果刚好系统在启动 rdp 服务，则会失败，因此要用 goto 循环

windows-set-netconf.bat

@@ -63,5 +63,5 @@ if defined mac_addr (
     )
 )
 
-rem 删除脚本文件
+rem 删除此脚本
 del "%~f0"