From 5bcc7f017f0ef86ce5f49d4caa4e6ca92823368e Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 2 May 2024 18:09:20 +0200 Subject: [PATCH] Update install.sh --- src/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/install.sh b/src/install.sh index d16ee4f..3ab6914 100644 --- a/src/install.sh +++ b/src/install.sh @@ -617,8 +617,8 @@ detectImage() { setXML "" && return 0 - desc=$(printVersion "$DETECTED" "$DETECTED") - warn "no answer file exists for this version ($DETECTED.xml), $FB." + desc=$(printEdition "$DETECTED" "this version") + warn "no answer file found for $desc ($DETECTED.xml), $FB." return 0 fi @@ -626,7 +626,7 @@ detectImage() { if [ -f "$dir/WIN51" ] || [ -f "$dir/SETUPXP.HTM" ]; then [ -d "$dir/AMD64" ] && DETECTED="winxpx64" || DETECTED="winxpx86" - desc=$(printVersion "$DETECTED" "Windows XP") + desc=$(printEdition "$DETECTED" "Windows XP") info "Detected: $desc" return 0 fi @@ -655,12 +655,12 @@ detectImage() { return 0 fi - desc=$(printVersion "$DETECTED" "$DETECTED") + desc=$(printEdition "$DETECTED" "$DETECTED") info "Detected: $desc" setXML "" && return 0 - msg="no answer file exists for this version ($DETECTED.xml)" + msg="no answer file found for $desc ($DETECTED.xml)" local fallback="/run/assets/${DETECTED%%-*}.xml" setXML "$fallback" && warn "${msg/version/edition}." || warn "${msg}, $FB."