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

fix: Custom URL parsing (#528)

parent 98204e54

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM scratch

COPY --from=qemux/qemu-docker:5.05 / /

COPY --from=qemux/qemu-docker:5.06 / /



ARG VERSION_ARG="0.0"

ARG DEBCONF_NOWARNINGS="yes"

src/define.sh

+6 −8
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ PLATFORM="x64" 


parseVersion() {



  VERSION="${VERSION/\//}"



  if [[ "${VERSION}" == \"*\" || "${VERSION}" == \'*\' ]]; then

    VERSION="${VERSION:1:-1}"

  fi
@@ -295,9 +293,9 @@ getLanguage() { 


parseLanguage() {



  REGION="${REGION/_/-/}"

  KEYBOARD="${KEYBOARD/_/-/}"

  LANGUAGE="${LANGUAGE/_/-/}"

  REGION="${REGION//_/-/}"

  KEYBOARD="${KEYBOARD//_/-/}"

  LANGUAGE="${LANGUAGE//_/-/}"



  [ -z "$LANGUAGE" ] && LANGUAGE="en"
@@ -443,7 +441,7 @@ fromFile() { 
  local file="${1,,}"

  local arch="${PLATFORM,,}"



  case "${file/ /_}" in

  case "${file// /_}" in

    *"_x64_"* | *"_x64."*)

      arch="x64"

      ;;
@@ -455,7 +453,7 @@ fromFile() { 
      ;;

  esac



  case "${file/ /_}" in

  case "${file// /_}" in

    "win7"* | "win_7"* | *"windows7"* | *"windows_7"* )

      id="win7${arch}"

      ;;

src/entry.sh

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ cd /run 
trap - ERR



info "Booting ${APP}${BOOT_DESC}..."

[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo



{ qemu-system-x86_64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :

(( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15

src/install.sh

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ startInstall() { 


  if [ -z "$CUSTOM" ]; then



    local file="${VERSION/\//}.iso"

    local file="${VERSION//\//}.iso"



    if [[ "${VERSION,,}" == "http"* ]]; then
@@ -80,7 +80,7 @@ startInstall() { 
      language="${language%%-*}"



      if [ -n "$language" ] && [[ "${language,,}" != "en" ]]; then

        file="${VERSION/\//}_${language,,}.iso"

        file="${VERSION//\//}_${language,,}.iso"

      fi



    fi
@@ -675,8 +675,8 @@ updateImage() { 
  local asset="$2"

  local language="$3"

  local file="autounattend.xml"

  local org="${file/.xml/.org}"

  local dat="${file/.xml/.dat}"

  local org="${file//.xml/.org}"

  local dat="${file//.xml/.dat}"

  local desc path src loc xml index result



  [[ "${DETECTED,,}" == "winxp"* ]] && return 0