mirror of
https://github.com/dockur/windows.git
synced 2025-10-29 04:05:50 +00:00
Update install.sh
This commit is contained in:
parent
eafb430a72
commit
9ee5264bd9
1 changed files with 6 additions and 12 deletions
|
|
@ -157,9 +157,6 @@ startInstall() {
|
||||||
if [ ! -f "$STORAGE/$CUSTOM" ]; then
|
if [ ! -f "$STORAGE/$CUSTOM" ]; then
|
||||||
CUSTOM=""
|
CUSTOM=""
|
||||||
ISO="$TMP/$BASE"
|
ISO="$TMP/$BASE"
|
||||||
if [[ "${PLATFORM,,}" == "arm64" ]]; then
|
|
||||||
[[ "$EXTERNAL" != [Yy1]* ]] && ISO="$TMP/$VERSION.esd"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
ISO="$STORAGE/$CUSTOM"
|
ISO="$STORAGE/$CUSTOM"
|
||||||
fi
|
fi
|
||||||
|
|
@ -358,15 +355,12 @@ downloadImage() {
|
||||||
|
|
||||||
if isESD "$version"; then
|
if isESD "$version"; then
|
||||||
|
|
||||||
if [[ "${PLATFORM,,}" == "x64" ]]; then
|
[[ "$tried" != "n" ]] && info "Failed to download $desc using Mido, will try a different method now..."
|
||||||
|
|
||||||
[[ "$tried" != "n" ]] && info "Failed to download $desc using Mido, will try a different method now..."
|
ISO="$TMP/$version.esd"
|
||||||
|
iso="$ISO"
|
||||||
ISO="$TMP/$version.esd"
|
rm -rf "$TMP"
|
||||||
iso="$ISO"
|
mkdir -p "$TMP"
|
||||||
rm -rf "$TMP"
|
|
||||||
mkdir -p "$TMP"
|
|
||||||
fi
|
|
||||||
|
|
||||||
tried="y"
|
tried="y"
|
||||||
|
|
||||||
|
|
@ -624,7 +618,7 @@ detectImage() {
|
||||||
[[ "$MANUAL" != [Yy1]* ]] && XML="$DETECTED.xml"
|
[[ "$MANUAL" != [Yy1]* ]] && XML="$DETECTED.xml"
|
||||||
info "Detected: $desc"
|
info "Detected: $desc"
|
||||||
else
|
else
|
||||||
warn "detected $desc, but no matching $DETECTED.xml file exists, $FB."
|
warn "detected $desc, but no matching file called $DETECTED.xml exists, $FB."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue