diff --git a/src/define.sh b/src/define.sh index bd885f9c..e5219f9f 100644 --- a/src/define.sh +++ b/src/define.sh @@ -451,6 +451,17 @@ printVersion() { [[ "${PLATFORM,,}" != "x64" ]] && desc+=" for ${PLATFORM}" fi + echo "$desc" + return 0 +} + +printVariant() { + + local id="$1" + local desc="$2" + + desc=$(printVersion "$id" "$desc") || return 1 + case "${id,,}" in *"-iot" | *"-iot-eval" ) desc+=" IoT" diff --git a/src/install.sh b/src/install.sh index 54d846c4..b7082d51 100644 --- a/src/install.sh +++ b/src/install.sh @@ -568,7 +568,7 @@ extractImage() { if [ -z "$CUSTOM" ]; then desc="downloaded ISO" if [[ "$version" != "http"* ]]; then - desc=$(printVersion "$version" "$desc") + desc=$(printVariant "$version" "$desc") fi fi @@ -949,7 +949,7 @@ prepareImage() { local dir="$2" local desc missing - desc=$(printVersion "$DETECTED" "$DETECTED") + desc=$(printVariant "$DETECTED" "$DETECTED") setMachine "$DETECTED" "$iso" "$dir" "$desc" || return 1 skipVersion "$DETECTED" && return 0 @@ -1313,7 +1313,7 @@ buildImage() { local out="$TMP/${base%.*}.tmp" rm -f "$out" - desc=$(printVersion "$DETECTED" "ISO") + desc=$(printVariant "$DETECTED" "ISO") local msg="Building $desc image" info "$msg..." && html "$msg..." diff --git a/src/mido.sh b/src/mido.sh index b050c47d..225ca5b1 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -912,7 +912,7 @@ downloadImage() { return 1 fi - desc=$(printVersion "$version" "") + desc=$(printVariant "$version" "") if [[ "${lang,,}" != "en" && "${lang,,}" != "en-"* ]]; then