mirror of
https://github.com/dockur/windows.git
synced 2026-08-03 20:47:12 +01:00
feat: Validate legacy settings before use (#1894)
This commit is contained in:
+3
-3
@@ -1727,8 +1727,7 @@ prepareInstall() {
|
|||||||
|
|
||||||
local username="${USERNAME:-Docker}"
|
local username="${USERNAME:-Docker}"
|
||||||
local password="${PASSWORD:-admin}"
|
local password="${PASSWORD:-admin}"
|
||||||
local organization="$APP for $ENGINE"
|
local sifUsername sifPassword sifOrganization
|
||||||
local sifUsername sifPassword
|
|
||||||
local regUsername regPassword
|
local regUsername regPassword
|
||||||
|
|
||||||
validateLegacyUsername "$username" "$desc" || return 1
|
validateLegacyUsername "$username" "$desc" || return 1
|
||||||
@@ -1736,6 +1735,7 @@ prepareInstall() {
|
|||||||
|
|
||||||
sifUsername=$(escapeSIFValue "$username") || return 1
|
sifUsername=$(escapeSIFValue "$username") || return 1
|
||||||
sifPassword=$(escapeSIFValue "$password") || return 1
|
sifPassword=$(escapeSIFValue "$password") || return 1
|
||||||
|
sifOrganization=$(escapeSIFValue "$APP for $ENGINE") || return 1
|
||||||
regUsername=$(escapeRegistryValue "$username") || return 1
|
regUsername=$(escapeRegistryValue "$username") || return 1
|
||||||
regPassword=$(escapeRegistryValue "$password") || return 1
|
regPassword=$(escapeRegistryValue "$password") || return 1
|
||||||
|
|
||||||
@@ -1775,7 +1775,7 @@ prepareInstall() {
|
|||||||
echo "[UserData]"
|
echo "[UserData]"
|
||||||
echo " FullName=\"$sifUsername\""
|
echo " FullName=\"$sifUsername\""
|
||||||
echo " ComputerName=\"*\""
|
echo " ComputerName=\"*\""
|
||||||
echo " OrgName=\"$organization\""
|
echo " OrgName=\"$sifOrganization\""
|
||||||
echo " $product"
|
echo " $product"
|
||||||
echo ""
|
echo ""
|
||||||
echo "[Identification]"
|
echo "[Identification]"
|
||||||
|
|||||||
Reference in New Issue
Block a user