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

fix: Simplify conditional checks (#1411)

parent 06518d8e

src/define.sh

+6 −6
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ getMido() { 
  local sum=""

  local size=""



  [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0

  [[ "${lang,,}" != "en" && "${lang,,}" != "en-us" ]] && return 0



  case "${id,,}" in

    "win11x64" )
@@ -812,7 +812,7 @@ getLink1() { 
  local size=""

  local host="https://dl.bobpony.com/windows"



  [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0

  [[ "${lang,,}" != "en" && "${lang,,}" != "en-us" ]] && return 0



  case "${id,,}" in

    "win11x64" | "win11x64-enterprise" | "win11x64-enterprise-eval" )
@@ -956,7 +956,7 @@ getLink2() { 
  local size=""

  local host="https://files.dog/MSDN"



  [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0

  [[ "${lang,,}" != "en" && "${lang,,}" != "en-us" ]] && return 0



  case "${id,,}" in

    "win81x64" )
@@ -1055,7 +1055,7 @@ getLink3() { 
  local size=""

  local host="https://nixsys.com/drivers"



  [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0

  [[ "${lang,,}" != "en" && "${lang,,}" != "en-us" ]] && return 0



  case "${id,,}" in

    "win7x64" | "win7x64-ultimate" )
@@ -1098,7 +1098,7 @@ getLink4() { 
  local size=""

  local host="https://archive.org/download"



  [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0

  [[ "${lang,,}" != "en" && "${lang,,}" != "en-us" ]] && return 0



  case "${id,,}" in

    "nano11" )
@@ -1406,7 +1406,7 @@ prepareInstall() { 
    error "Failed to locate directory \"$target\" in $desc ISO image!" && return 1

  fi



  if [[ "${driver,,}" == "xp" ]] || [[ "${driver,,}" == "2k3" ]]; then

  if [[ "${driver,,}" == "xp" || "${driver,,}" == "2k3" ]]; then



    local msg="Adding drivers to image..."

    info "$msg" && html "$msg"

src/install.sh

+3 −3
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ finishInstall() { 
      fi

    else

      # Enable secure boot + TPM on manual installs as Win11 requires

      if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then

      if [[ "$MANUAL" == [Yy1]* || "$aborted" == [Yy1]* ]]; then

        if [[ "${DETECTED,,}" == "win11"* ]]; then

          BOOT_MODE="windows_secure"

          echo "$BOOT_MODE" > "$STORAGE/windows.mode"
@@ -696,7 +696,7 @@ detectImage() { 
  desc=$(printEdition "$DETECTED" "$DETECTED")

  detectLanguage "$info"



  if [[ "${LANGUAGE,,}" != "en" ]] && [[ "${LANGUAGE,,}" != "en-"* ]]; then

  if [[ "${LANGUAGE,,}" != "en" && "${LANGUAGE,,}" != "en-"* ]]; then

    language=$(getLanguage "$LANGUAGE" "desc")

    desc+=" ($language)"

  fi
@@ -704,7 +704,7 @@ detectImage() { 
  info "Detected: $desc"

  setXML "" && return 0



  if [[ "$DETECTED" == "win81x86"* ]] || [[ "$DETECTED" == "win10x86"* ]]; then

  if [[ "$DETECTED" == "win81x86"* || "$DETECTED" == "win10x86"* ]]; then

    error "The 32-bit version of $desc is not supported!" && return 1

  fi

src/mido.sh

+5 −5
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ download_windows_eval() { 


  iso_download_links=$(echo "$iso_download_page_html" | grep -io "$filter") || {

    # This should only happen if there's been some change to the download endpoint web address

    if [[ "${lang,,}" == "en" ]] || [[ "${lang,,}" == "en-"* ]]; then

    if [[ "${lang,,}" == "en" || "${lang,,}" == "en-"* ]]; then

      error "Windows server download page gave us no download link!"

    else

      language=$(getLanguage "$lang" "desc")
@@ -327,7 +327,7 @@ getWindows() { 


  case "${version,,}" in

    "win2008r2" | "win81${PLATFORM,,}"* | "win11${PLATFORM,,}-enterprise-iot"* | "win11${PLATFORM,,}-enterprise-ltsc"* )

      if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then

      if [[ "${lang,,}" != "en" && "${lang,,}" != "en-"* ]]; then

        error "No download in the $language language available for $edition!"

        MIDO_URL="" && return 1

      fi ;;
@@ -528,8 +528,8 @@ verifyFile() { 
  local total="$3"

  local check="$4"



  if [ -n "$size" ] && [[ "$total" != "$size" ]] && [[ "$size" != "0" ]]; then

    if [[ "$VERIFY" == [Yy1]* ]] || [[ "$DEBUG" == [Yy1]* ]]; then

  if [ -n "$size" ] && [[ "$total" != "$size" && "$size" != "0" ]]; then

    if [[ "$VERIFY" == [Yy1]* || "$DEBUG" == [Yy1]* ]]; then

      warn "The downloaded file has a different size ( $total bytes) than expected ( $size bytes). Please report this at $SUPPORT/issues"

    fi

  fi
@@ -654,7 +654,7 @@ downloadImage() { 


  desc=$(printVersion "$version" "")



  if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then

  if [[ "${lang,,}" != "en" && "${lang,,}" != "en-"* ]]; then

    language=$(getLanguage "$lang" "desc")

    if ! validVersion "$version" "$lang"; then

      desc=$(printEdition "$version" "$desc")