diff --git a/README.en.md b/README.en.md
index 52e2288..f78b070 100644
--- a/README.en.md
+++ b/README.en.md
@@ -41,7 +41,7 @@ The system requirements for the target system are as follows:
| RedHat Alma Rocky | 8, 9 | 512 MB \* | 5 GB |
| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB |
| Oracle | 7, 8, 9 | 512 MB \* | 5 GB |
-| Fedora | 39, 40 | 512 MB \* | 5 GB |
+| Fedora | 40, 41 | 512 MB \* | 5 GB |
| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB |
| openSUSE | 15.5, 15.6, Tumbleweed (Rolling) | 512 MB \* | 5 GB |
| NixOS | 24.05 | 512 MB | 5 GB |
@@ -140,7 +140,7 @@ bash reinstall.sh centos 9
redhat 8|9 --img='http://xxx.com/xxx.qcow2'
opencloudos 8|9
oracle 7|8|9
- fedora 39|40
+ fedora 40|41
nixos 24.05
debian 9|10|11|12
openeuler 20.03|22.03|24.03
@@ -266,7 +266,7 @@ bash reinstall.sh netboot.xyz
#### Method 1: Let the Script Automatically Search for ISO (Recommended)
- Typically, Windows releases new official ISOs every month, which integrate the latest system patches, avoiding the need to download a bunch of updates right after installation.
-- The script will search for ISOs from , a site that collects monthly released ISOs, ensuring that the ISOs found by the script are the official latest versions.
+- The script will search for ISOs from , a site that collects monthly released ISOs, ensuring that the ISOs found by the script are the official latest versions.
- Systems marked with \* do not support automatic ISO searching.
```bash
@@ -336,13 +336,13 @@ bash reinstall.sh windows \
The following website provides ISO links.
-- (Recommended, iso sourced from official channels, updated monthly, includes the latest patches)
+- (Recommended, iso sourced from official channels, updated monthly, includes the latest patches)
- (Need to open it with a non-Windows User-Agent)
-
- (Preview)
-
-
--
+-
-
-
-
diff --git a/README.md b/README.md
index 68a738e..10c5fdf 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@
| RedHat Alma Rocky | 8, 9 | 512 MB \* | 5 GB |
| OpenCloudOS | 8, 9 | 512 MB \* | 5 GB |
| Oracle | 7, 8, 9 | 512 MB \* | 5 GB |
-| Fedora | 39, 40 | 512 MB \* | 5 GB |
+| Fedora | 40, 41 | 512 MB \* | 5 GB |
| openEuler | 20.03, 22.03, 24.03 | 512 MB \* | 5 GB |
| openSUSE | 15.5, 15.6, Tumbleweed (滚动) | 512 MB \* | 5 GB |
| NixOS | 24.05 | 512 MB | 5 GB |
@@ -140,7 +140,7 @@ bash reinstall.sh centos 9
redhat 8|9 --img='http://xxx.com/xxx.qcow2'
opencloudos 8|9
oracle 7|8|9
- fedora 39|40
+ fedora 40|41
nixos 24.05
debian 9|10|11|12
openeuler 20.03|22.03|24.03
@@ -266,7 +266,7 @@ bash reinstall.sh netboot.xyz
#### 方法 1: 让脚本自动查找 ISO (推荐)
- 通常情况下 Windows 每个月都会发布新的官方 ISO,集成了最新的系统补丁,避免了刚安装好系统就要下载一堆补丁
-- 脚本会从 查找 ISO,该网站收录了每月发布的 ISO,因此脚本查找到的 ISO 都是官方最新版
+- 脚本会从 查找 ISO,该网站收录了每月发布的 ISO,因此脚本查找到的 ISO 都是官方最新版
- 上面带 \* 的系统不支持自动查找 ISO
```bash
@@ -336,13 +336,13 @@ bash reinstall.sh windows \
以下网站可找到 ISO 链接
-- (推荐,iso 来自官方,每月更新,包含最新补丁)
+- (推荐,iso 来自官方,每月更新,包含最新补丁)
- (需用非 Windows User-Agent 打开)
-
- (预览版)
-
-
--
+-
-
-
-
diff --git a/reinstall.sh b/reinstall.sh
index d262c16..e7bce42 100644
--- a/reinstall.sh
+++ b/reinstall.sh
@@ -45,7 +45,7 @@ Usage: $reinstall_____ centos 9
redhat 8|9 --img='http://xxx.com/xxx.qcow2'
opencloudos 8|9
oracle 7|8|9
- fedora 39|40
+ fedora 40|41
nixos 24.05
debian 9|10|11|12
openeuler 20.03|22.03|24.03
@@ -773,7 +773,7 @@ get_windows_iso_links() {
label_vlsc=$(get_label_vlsc)
page=$(get_page)
- page_url=https://massgrave.dev/windows_${page}_links.html
+ page_url=https://massgrave.dev/windows_${page}_links
info "Find windows iso"
echo "Version: $version"
@@ -787,7 +787,7 @@ get_windows_iso_links() {
error_and_exit "Not support find this iso. Check --image-name or set --iso manually."
fi
- curl -L "$page_url" | grep -ioP 'https://.*?.iso' >$tmp/win.list
+ curl -L "$page_url" | grep -ioP 'https://.*?.(iso|img)' >$tmp/win.list
# 如果不是 ltsc ,应该先去除 ltsc 链接,否则最终链接有 ltsc 的
# 例如查找 windows 10 iot enterprise,会得到
@@ -821,14 +821,14 @@ get_windows_iso_link() {
regex+="${i}_"
fi
done
- regex+=".*${arch_win}.*.iso"
+ regex+=".*${arch_win}.*.(iso|img)"
regexs+=("$regex")
done
fi
# vlsc
if [ -n "$label_vlsc" ]; then
- regex="sw_dvd9_win_${label_vlsc}_${version}.*${arch_win}_${full_lang}.*.iso"
+ regex="sw_dvd[59]_win_${label_vlsc}_${version}.*${arch_win}_${full_lang}.*.(iso|img)"
regexs+=("$regex")
fi
@@ -1161,7 +1161,7 @@ Continue?
if is_in_china; then
mirror=https://mirror.sjtu.edu.cn/opensuse
else
- mirror=https://provo-mirror.opensuse.org
+ mirror=https://mirror.fcix.net/opensuse
fi
if [ "$releasever" = tumbleweed ]; then
@@ -1446,7 +1446,7 @@ verify_os_name() {
'redhat 8|9' \
'opencloudos 8|9' \
'oracle 7|8|9' \
- 'fedora 39|40' \
+ 'fedora 40|41' \
'nixos 24.05' \
'debian 9|10|11|12' \
'openeuler 20.03|22.03|24.03' \
@@ -2334,7 +2334,7 @@ install_grub_linux_efi() {
if is_in_china; then
mirror=https://mirror.sjtu.edu.cn/opensuse
else
- mirror=https://provo-mirror.opensuse.org
+ mirror=https://mirror.fcix.net/opensuse
fi
[ "$basearch" = x86_64 ] && ports='' || ports=/ports/$basearch