From ae39924d9a4fe9049af41b9231a8ff37aefd5d4d Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Sat, 25 Nov 2023 21:27:38 +1100
Subject: [PATCH] Shorten build folder names

---
 tools/msys2_build_32_64.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/msys2_build_32_64.sh b/tools/msys2_build_32_64.sh
index 00319cbe886..f0241d14de3 100755
--- a/tools/msys2_build_32_64.sh
+++ b/tools/msys2_build_32_64.sh
@@ -62,8 +62,8 @@ QT_ROOT_DIR="${HOME}/qt"
 ROOT_DIR="${HOME}"
 SOURCE_DIR="${REPO_OWNER}/${REPO_NAME}"
 
-OUTPUT_DIR_PREFIX="build-output"
-OUTPUT_TARGET_PLACEHOLDER="-<target>"
+OUTPUT_DIR_PREFIX="build-"
+OUTPUT_TARGET_PLACEHOLDER="<target>"
 OUTPUT_DIR="${SOURCE_DIR}"
 OUTPUT_APPEND_TARGET=1
 OUTPUT_DELETE=0
@@ -178,7 +178,11 @@ function build_output_path() {
 	#	1 - Target
 
   outpath="${ROOT_DIR}/${OUTPUT_DIR}/${OUTPUT_DIR_PREFIX}"
-  if [[ $OUTPUT_APPEND_TARGET -eq 1 ]]; then outpath+="-${1}"; fi
+  if [[ $OUTPUT_APPEND_TARGET -eq 1 ]]; then
+    outpath+="${1}";
+  else
+    outpath+="output";
+  fi
   echo ${outpath}
 }
 
@@ -367,6 +371,8 @@ OUTPUT_PATH="${ROOT_DIR}/${OUTPUT_DIR}/${OUTPUT_DIR_PREFIX}"
 
 if [[ $OUTPUT_APPEND_TARGET -eq 1 ]]; then
   OUTPUT_PATH+="${OUTPUT_TARGET_PLACEHOLDER}"
+else
+  OUTPUT_PATH+="output"
 fi
 
 validate_edgetx_version