From dfbe9078e93920e192dbe44cd00d4f8c3af3acda Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 13 Oct 2024 10:38:56 +0200
Subject: [PATCH] Update define.sh

---
 src/define.sh | 58 +++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/define.sh b/src/define.sh
index a8aea4948..c1e3e04b0 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -1637,6 +1637,31 @@ validVersion() {
   return 1
 }
 
+addFolder() {
+
+  local src="$1"
+  local folder="/oem"
+
+  [ ! -d "$folder" ] && folder="/OEM"
+  [ ! -d "$folder" ] && folder="$STORAGE/oem"
+  [ ! -d "$folder" ] && folder="$STORAGE/OEM"
+  [ ! -d "$folder" ] && return 0
+
+  local msg="Adding OEM folder to image..."
+  info "$msg" && html "$msg"
+
+  local dest="$src/\$OEM\$/\$1/OEM"
+  mkdir -p "$dest"
+
+  ! cp -r "$folder/." "$dest" && return 1
+
+  local file
+  file=$(find "$dest" -maxdepth 1 -type f -iname install.bat | head -n 1)
+  [ -f "$file" ] && unix2dos -q "$file"
+
+  return 0
+}
+
 migrateFiles() {
 
   local base="$1"
@@ -1749,23 +1774,14 @@ prepareInstall() {
     warn "this version of $desc requires a volume license key (VLK), it will ask for one during installation."
   fi
 
-  local oem=""
-  local folder="/oem"
-
-  [ ! -d "$folder" ] && folder="/OEM"
-  [ ! -d "$folder" ] && folder="$STORAGE/oem"
-  [ ! -d "$folder" ] && folder="$STORAGE/OEM"
-
-  if [ -d "$folder" ]; then
-
-    file=$(find "$folder" -maxdepth 1 -type f -iname install.bat | head -n 1)
-
-    if [ -f "$file" ]; then
-      unix2dos -q "$file"
-      oem="\"Script\"=\"cmd /C start \\\"Install\\\" \\\"cmd /C C:\\\\OEM\\\\install.bat\\\"\""
-    fi
+  if ! addFolder "$dir"; then
+    error "Failed to add OEM folder to image!" && return 1
   fi
 
+  local oem=""
+  local install="$dir/\$OEM\$/\$1/OEM/install.bat"
+  [ -f "$install" ] && oem="\"Script\"=\"cmd /C start \\\"Install\\\" \\\"cmd /C C:\\\\OEM\\\\install.bat\\\"\""
+
   [ -z "$YRES" ] && YRES="720"
   [ -z "$XRES" ] && XRES="1280"
 
@@ -1958,18 +1974,6 @@ prepareInstall() {
           echo ""
   } | unix2dos > "$dir/\$OEM\$/cmdlines.txt"
 
-  [ ! -d "$folder" ] && return 0
-
-  msg="Adding OEM folder to image..."
-  info "$msg" && html "$msg"
-
-  local dest="$dir/\$OEM\$/\$1/OEM"
-  mkdir -p "$dest"
-
-  if ! cp -r "$folder/." "$dest"; then
-    error "Failed to copy OEM folder!" && return 1
-  fi
-
   return 0
 }