mirror of
https://github.com/dockur/windows.git
synced 2026-07-28 21:53:34 +07:00
fix: Preserve Server Evaluation identity during image detection (#1975)
This commit is contained in:
+16
-1
@@ -220,6 +220,21 @@ getVersions() {
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
local evaluation=""
|
||||||
|
|
||||||
|
if [[ "${image,,}" == *"evaluation"* ||
|
||||||
|
"${display,,}" == *"evaluation"* ||
|
||||||
|
"${product,,}" == *"evaluation"* ||
|
||||||
|
"${edition_id,,}" == *"eval"* ||
|
||||||
|
"${flags,,}" == *"eval"* ]]; then
|
||||||
|
evaluation="-eval"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$evaluation" ] &&
|
||||||
|
[[ "${candidate_id,,}" != *"-eval" ]]; then
|
||||||
|
candidate_id+="$evaluation"
|
||||||
|
fi
|
||||||
|
|
||||||
local key="${candidate_id,,}"
|
local key="${candidate_id,,}"
|
||||||
|
|
||||||
# Some client media use the same friendly name-derived ID for distinct
|
# Some client media use the same friendly name-derived ID for distinct
|
||||||
@@ -246,7 +261,7 @@ getVersions() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -n "$structured" ]; then
|
if [ -n "$structured" ]; then
|
||||||
candidate_id="$candidate_base-$structured"
|
candidate_id="$candidate_base-$structured$evaluation"
|
||||||
key="${candidate_id,,}"
|
key="${candidate_id,,}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user