feat: Don't display domain (#1190)
Some checks failed
Build / Test (push) Has been cancelled
Build / Build (push) Has been cancelled

This commit is contained in:
Kroese 2025-04-06 08:36:54 +02:00 committed by GitHub
parent fa40d30e5d
commit d008b18d1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions

View File

@ -723,8 +723,7 @@ updateXML() {
sed -i "s/<Username>Docker<\/Username>/<Username>$user<\/Username>/g" "$asset"
fi
[ -n "$PASSWORD" ] && pass="$PASSWORD"
[ -z "$pass" ] && pass="admin"
[ -n "$PASSWORD" ] && pass="$PASSWORD" || pass="admin"
pw=$(printf '%s' "${pass}Password" | iconv -f utf-8 -t utf-16le | base64 -w 0)
admin=$(printf '%s' "${pass}AdministratorPassword" | iconv -f utf-8 -t utf-16le | base64 -w 0)

View File

@ -529,6 +529,7 @@ downloadFile() {
local size="$4"
local lang="$5"
local desc="$6"
local msg="Downloading $desc"
local rc total total_gb progress domain dots space folder
rm -f "$iso"
@ -547,8 +548,8 @@ downloadFile() {
progress="--progress=dot:giga"
fi
local msg="Downloading $desc"
html "$msg..."
/run/progress.sh "$iso" "$size" "$msg ([P])..." &
domain=$(echo "$url" | awk -F/ '{print $3}')
dots=$(echo "$domain" | tr -cd '.' | wc -c)
@ -559,7 +560,6 @@ downloadFile() {
fi
info "$msg..."
/run/progress.sh "$iso" "$size" "$msg ([P])..." &
{ wget "$url" -O "$iso" -q --timeout=30 --no-http-keep-alive --show-progress "$progress"; rc=$?; } || :