Selaa lähdekoodia

build: Update QEMU base image to v7.20 (#1446)

Kroese 1 kuukausi sitten
vanhempi
sitoutus
ae185de314
4 muutettua tiedostoa jossa 11 lisäystä ja 9 poistoa
  1. 1 1
      Dockerfile
  2. 1 0
      src/entry.sh
  3. 3 2
      src/install.sh
  4. 6 6
      src/mido.sh

+ 1 - 1
Dockerfile

@@ -3,7 +3,7 @@
 ARG VERSION_ARG="latest"
 FROM scratch AS build-amd64
 
-COPY --from=qemux/qemu:7.19 / /
+COPY --from=qemux/qemu:7.20 / /
 
 ARG TARGETARCH
 ARG DEBCONF_NOWARNINGS="yes"

+ 1 - 0
src/entry.sh

@@ -8,6 +8,7 @@ set -Eeuo pipefail
 
 cd /run
 
+. start.sh      # Placeholder
 . utils.sh      # Load functions
 . reset.sh      # Initialize system
 . define.sh     # Define versions

+ 3 - 2
src/install.sh

@@ -127,8 +127,9 @@ startInstall() {
     if [[ "${VERSION,,}" == "http"* ]]; then
 
       file=$(basename "${VERSION%%\?*}")
-      : "${file//+/ }"; printf -v file '%b' "${_//%/\\x}"
-      file=$(echo "$file" | sed -e 's/[^A-Za-z0-9._-]/_/g')
+      file="${file//+/ }"
+      printf -v file '%b' "${file//%/\\x}"
+      file="${file//[!A-Za-z0-9._-]/_}"
 
     else
 

+ 6 - 6
src/mido.sh

@@ -171,8 +171,6 @@ download_windows() {
     return 1
   fi
 
-  [[ "$DEBUG" == [Yy1]* ]] && echo "Found download link: $iso_download_link"
-
   MIDO_URL="$iso_download_link"
   return 0
 }
@@ -309,17 +307,19 @@ download_windows_eval() {
     return $?
   }
 
-  [[ "$DEBUG" == [Yy1]* ]] && echo "Found download link: $iso_download_link"
-
   case "${PLATFORM,,}" in
     "x64" )
       if [[ "${iso_download_link,,}" != *"x64"* ]]; then
-        error "Download link is for the wrong platform? Please report this at $SUPPORT/issues" 
+        echo "Found download link: $iso_download_link"
+        error "Download link is for the wrong platform? Please report this at $SUPPORT/issues"
         return 1
       fi ;;
     "arm64" )
       if [[ "${iso_download_link,,}" != *"a64"* && "${iso_download_link,,}" != *"arm64"* ]]; then
-        [[ "$DEBUG" == [Yy1]* ]] && echo "Link for ARM platform currently not available!"
+        if [[ "$DEBUG" == [Yy1]* ]]; then
+          echo "Found download link: $iso_download_link"
+          echo "Link for ARM platform currently not available!"
+        fi
         return 1
       fi ;;
   esac