Skip to content

Commit 4cf8e81

Browse files
committed
windows: 修复查找 windows server 2025 iso 失效
1 parent ff4b6de commit 4cf8e81

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

reinstall.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,14 @@ find_windows_iso() {
882882
full_lang=$(english)
883883

884884
case "$basearch" in
885-
x86_64) arch_win=x64 ;;
886-
aarch64) arch_win=arm64 ;;
885+
x86_64)
886+
arch_win=x64
887+
arch_win_vlsc=64bit
888+
;;
889+
aarch64)
890+
arch_win=arm64
891+
arch_win_vlsc=arm64
892+
;;
887893
esac
888894

889895
get_windows_iso_link
@@ -1009,6 +1015,9 @@ get_windows_iso_link() {
10091015
pro | education | enterprise | 'pro education' | 'pro for workstations') echo pro ;;
10101016
esac
10111017
;;
1018+
2025)
1019+
echo SrvSTDCORE
1020+
;;
10121021
esac
10131022
}
10141023

@@ -1136,8 +1145,11 @@ get_windows_iso_link_inner() {
11361145
fi
11371146

11381147
# vlsc
1148+
# SW_DVD5_Win_10_IOT_Enterprise_2015_LTSB_64Bit_EMB_English_OEM_X20-20063.IMG
1149+
# SW_DVD9_Win_Pro_10_22H2.15_Arm64_English_Pro_Ent_EDU_N_MLF_X23-67223.ISO
1150+
# SWDVD9_WinSrvSTDCORE2025_24H2.16_64Bit_English_DC_STD_MLF_RTMUpdJan26_X24-26760.iso
11391151
if [ -n "$label_vlsc" ]; then
1140-
regex="sw_dvd[59]_win_${label_vlsc}_${version}.*${arch_win}_${full_lang}.*.(iso|img)"
1152+
regex="sw_?dvd[59]_win_?${label_vlsc}_?${version}.*${arch_win_vlsc}_${full_lang}.*.(iso|img)"
11411153
regexs+=("$regex")
11421154
fi
11431155

0 commit comments

Comments
 (0)