mirror of
https://github.com/dockur/windows.git
synced 2025-12-21 06:31:45 +00:00
Compare commits
3 Commits
465d0065b9
...
8471d296ea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8471d296ea | ||
|
|
6470d19bc7 | ||
|
|
425a661c93 |
@ -436,7 +436,7 @@ printVersion() {
|
||||
"tiny11"* ) desc="Tiny 11" ;;
|
||||
"tiny10"* ) desc="Tiny 10" ;;
|
||||
"core11"* ) desc="Core 11" ;;
|
||||
"nano11"* ) desc="Nano 11" ;;
|
||||
"nano11"* ) desc="Nano 11" ;;
|
||||
"win7"* ) desc="Windows 7" ;;
|
||||
"win8"* ) desc="Windows 8" ;;
|
||||
"win10"* ) desc="Windows 10" ;;
|
||||
@ -577,7 +577,7 @@ fromFile() {
|
||||
;;
|
||||
"nano11"* | "nano_11"* )
|
||||
id="nano11"
|
||||
;;
|
||||
;;
|
||||
"tiny11core"* | "tiny11_core"* | "tiny_11_core"* )
|
||||
id="core11"
|
||||
;;
|
||||
|
||||
16
src/mido.sh
16
src/mido.sh
@ -372,7 +372,7 @@ getCatalog() {
|
||||
local name=""
|
||||
local edition=""
|
||||
local file="catalog.cab"
|
||||
|
||||
|
||||
case "${id,,}" in
|
||||
"win11${PLATFORM,,}" )
|
||||
edition="Professional"
|
||||
@ -411,7 +411,7 @@ getOldCatalog() {
|
||||
local name=""
|
||||
local edition=""
|
||||
local file="catalog.xml"
|
||||
|
||||
|
||||
case "${id,,}" in
|
||||
"win11${PLATFORM,,}" )
|
||||
edition="Professional"
|
||||
@ -452,11 +452,11 @@ getESD() {
|
||||
winCatalog=$(getCatalog "$version" "url")
|
||||
editionName=$(getCatalog "$version" "edition")
|
||||
|
||||
if [ -z "$file" || -z "$winCatalog" || -z "$editionName" ]; then
|
||||
if [ -z "$file" ] || [ -z "$winCatalog" ] || [ -z "$editionName" ]; then
|
||||
error "Invalid VERSION specified, value \"$version\" is not recognized!" && return 1
|
||||
fi
|
||||
|
||||
local msg="Downloading product information from Microsoft server..."
|
||||
local msg="Downloading product information..."
|
||||
info "$msg" && html "$msg"
|
||||
|
||||
rm -rf "$dir"
|
||||
@ -680,7 +680,7 @@ downloadImage() {
|
||||
base=$(basename "$iso")
|
||||
desc=$(fromFile "$base")
|
||||
|
||||
rm -f "$iso"
|
||||
rm -f "$iso"
|
||||
downloadFile "$iso" "$version" "" "" "" "$desc" && return 0
|
||||
info "$msg" && html "$msg" && sleep "$delay"
|
||||
downloadFile "$iso" "$version" "" "" "" "$desc" && return 0
|
||||
@ -720,7 +720,7 @@ downloadImage() {
|
||||
size=$(getMido "$version" "$lang" "size" )
|
||||
sum=$(getMido "$version" "$lang" "sum")
|
||||
|
||||
rm -f "$iso"
|
||||
rm -f "$iso"
|
||||
downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0
|
||||
info "$msg" && html "$msg" && sleep "$delay"
|
||||
downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0
|
||||
@ -768,12 +768,12 @@ downloadImage() {
|
||||
if [[ "$tried" != "n" ]]; then
|
||||
info "Failed to download $desc, will try another mirror now..."
|
||||
fi
|
||||
|
||||
|
||||
tried="y"
|
||||
size=$(getSize "$i" "$version" "$lang")
|
||||
sum=$(getHash "$i" "$version" "$lang")
|
||||
|
||||
rm -f "$iso"
|
||||
rm -f "$iso"
|
||||
downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0
|
||||
info "$msg" && html "$msg" && sleep "$delay"
|
||||
downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user