Quellcode durchsuchen

feat: Don't display domain (#1190)

Kroese vor 3 Monaten
Ursprung
Commit
d008b18d1d
2 geänderte Dateien mit 3 neuen und 4 gelöschten Zeilen
  1. 1 2
      src/install.sh
  2. 2 2
      src/mido.sh

+ 1 - 2
src/install.sh

@@ -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)

+ 2 - 2
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=$?; } || :