From d008b18d1d69d79cef3da2e766e8bcc19691c770 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 6 Apr 2025 08:36:54 +0200 Subject: [PATCH] feat: Don't display domain (#1190) --- src/install.sh | 3 +-- src/mido.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/install.sh b/src/install.sh index 4e2244c..0ad4449 100644 --- a/src/install.sh +++ b/src/install.sh @@ -723,8 +723,7 @@ updateXML() { sed -i "s/Docker<\/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) diff --git a/src/mido.sh b/src/mido.sh index 95e92ac..1e4e630 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -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=$?; } || :