Unverified Commit 2412a3ed authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Local variable declaration (#1736)

parent 8c57b119
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -1860,7 +1860,6 @@ detectLegacy() {
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51IB -print -quit)
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51ID -print -quit)
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51IL -print -quit)
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51IS -print -quit)
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51AA -print -quit)
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51AD -print -quit)
    [ -z "$find" ] && find=$(find "$dir" -maxdepth 1 -type f -iname WIN51AS -print -quit)
+4 −4
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ extractESD() {
  local version="$3"
  local desc="$4"
  local size size_gb sizes space space_gb
  local desc total total1 total2 total3 total4
  local retVal total total1 total2 total3 total4
  local imageIndex links links1 links2 links3 links4

  local msg="Extracting $desc bootdisk"
@@ -1218,11 +1218,11 @@ buildImage() {
    error "Failed to build image!" && return 1
  fi

  local error=""
  local err=""
  local hide="Warning: creating filesystem that does not conform to ISO-9660."

  [ -s "$log" ] && error="$(<"$log")"
  [[ "$error" != "$hide" ]] && echo "$error"
  [ -s "$log" ] && err="$(<"$log")"
  [[ "$err" != "$hide" ]] && echo "$err"

  mv -f "$out" "$BOOT" || return 1
  ! setOwner "$BOOT" && error "Failed to set the owner for \"$BOOT\" !"
+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ handle_curl_error() {

get_agent() {

  local user_agent
  local browser_version

  # Determine approximate latest Firefox release
  browser_version="$((124 + ($(date +%s) - 1710892800) / 2419200))"
@@ -273,6 +273,7 @@ download_windows_eval() {
  culture=$(getLanguage "$lang" "culture")

  local country="${culture#*-}"
  local iso_download_links=""
  local iso_download_page_html=""
  local url="https://www.microsoft.com/en-us/evalcenter/download-$windows_version"

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ finish() {
      # Workaround for zombie pid
      [ ! -s "$QEMU_PID" ] && break

      if [ "$cnt" == "5" ]; then
      if [ "$cnt" -eq 5 ]; then
        echo && error "QEMU did not terminate itself, forcefully killing process..."
        { kill -9 "$pid" || true; } 2>/dev/null
      fi