fix: Custom URL parsing (#528)

dockur · May 21, 2024 · b1f10aa · b1f10aa
1 parent 98204e5
commit b1f10aa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 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"

diff --git a/src/define.sh b/src/define.sh
@@ -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}"
       ;;
@@ -2062,7 +2060,7 @@ prepareXP() {
           echo ""
           echo "[TerminalServices]"
           echo "    AllowConnections=1"
-          echo "" 
+          echo ""
   } | unix2dos > "$target/WINNT.SIF"
 
   {       echo "Windows Registry Editor Version 5.00"

diff --git a/src/entry.sh b/src/entry.sh
@@ -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

diff --git a/src/install.sh b/src/install.sh
@@ -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