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

fix: Remove non-printable characters (#1160)

parent 77a8e4d2

Dockerfile

+1 −1
Original line number Diff line number Diff line 
ARG VERSION_ARG="latest"

FROM scratch AS build-amd64



COPY --from=qemux/qemu:7.04 / /

COPY --from=qemux/qemu:7.05 / /



ARG DEBCONF_NOWARNINGS="yes"

ARG DEBIAN_FRONTEND="noninteractive"

src/install.sh

+11 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ skipInstall() { 


  if [ -f "$previous" ]; then

    previous=$(<"$previous")

    previous="${previous//[![:print:]]/}"

    if [ -n "$previous" ]; then

      previous="$STORAGE/$previous"

      if [[ "${previous,,}" != "${iso,,}" ]]; then
@@ -1014,19 +1015,27 @@ bootWindows() { 


  if [ -f "$STORAGE/windows.args" ]; then

    ARGS=$(<"$STORAGE/windows.args")

    ARGS="${ARGS//[![:print:]]/}"

    ARGUMENTS="$ARGS ${ARGUMENTS:-}"

  fi



  if [ -s "$STORAGE/windows.type" ] && [ -f "$STORAGE/windows.type" ]; then

    [ -z "${DISK_TYPE:-}" ] && DISK_TYPE=$(<"$STORAGE/windows.type")

    if [ -z "${DISK_TYPE:-}" ]; then

      DISK_TYPE=$(<"$STORAGE/windows.type")

      DISK_TYPE="${DISK_TYPE//[![:print:]]/}"

    fi

  fi



  if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then

    BOOT_MODE=$(<"$STORAGE/windows.mode")

    BOOT_MODE="${BOOT_MODE//[![:print:]]/}"

  fi



  if [ -s "$STORAGE/windows.old" ] && [ -f "$STORAGE/windows.old" ]; then

    [[ "${PLATFORM,,}" == "x64" ]] && MACHINE=$(<"$STORAGE/windows.old")

    if [[ "${PLATFORM,,}" == "x64" ]]; then

      MACHINE=$(<"$STORAGE/windows.old")

      MACHINE="${MACHINE//[![:print:]]/}"

    fi

  fi



  return 0

src/mido.sh

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ download_windows() { 


  # uuidgen: For MacOS (installed by default) and other systems (e.g. with no /proc) that don't have a kernel interface for generating random UUIDs

  session_id=$(cat /proc/sys/kernel/random/uuid 2> /dev/null || uuidgen --random)

  session_id="${session_id//[![:print:]]/}"



  # Get product edition ID for latest release of given Windows version

  # Product edition ID: This specifies both the Windows release (e.g. 22H2) and edition ("multi-edition" is default, either Home/Pro/Edu/etc., we select "Pro" in the answer files) in one number