From b18dc3f8547b29b69c4906e1e88c07310ed3cfed Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sat, 18 Oct 2025 13:08:46 -0700
Subject: [PATCH] fixed msys2 paths

---
 create_project.cmd           | 8 +++++---
 src/scripts/cleanup.cmd      | 2 +-
 src/scripts/deliver.cmd      | 2 +-
 src/scripts/info.cmd         | 2 +-
 src/scripts/make_package.cmd | 2 +-
 src/scripts/make_win32.cmd   | 2 +-
 src/scripts/run_tests.cmd    | 2 +-
 src/scripts/setup_msys2.cmd  | 2 +-
 update_project.cmd           | 8 +++++---
 9 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/create_project.cmd b/create_project.cmd
index d18be5a..279ecd4 100644
--- a/create_project.cmd
+++ b/create_project.cmd
@@ -2,9 +2,11 @@
 
 setlocal
 
-pushd "%~dp0%"
+pushd "%~dp0"
 call src\scripts\setup_msys2.cmd
 
-for /f "usebackq tokens=*" %%i in (`cygpath "%2"`) do set ARG1=%%i
-call mingw64 -no-start ./create_project.sh "%1" "%ARG1%"
+for /f "usebackq tokens=*" %%i in (`cygpath "%~2"`) do set ARG1=%%i
+call mingw64 -no-start ./create_project.sh "%~1" "%ARG1%"
 popd
+
+endlocal
diff --git a/src/scripts/cleanup.cmd b/src/scripts/cleanup.cmd
index 71111cb..fa6f784 100644
--- a/src/scripts/cleanup.cmd
+++ b/src/scripts/cleanup.cmd
@@ -6,6 +6,6 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./cleanup.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
diff --git a/src/scripts/deliver.cmd b/src/scripts/deliver.cmd
index 9fe7bf0..c7dda96 100644
--- a/src/scripts/deliver.cmd
+++ b/src/scripts/deliver.cmd
@@ -8,6 +8,6 @@ set ARG1=%~3
 set ARG2=%~4
 set ARG3=%~5
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./deliver.sh "%DEST%" "%DIST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
diff --git a/src/scripts/info.cmd b/src/scripts/info.cmd
index a560b9d..4510008 100644
--- a/src/scripts/info.cmd
+++ b/src/scripts/info.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./info.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
 
diff --git a/src/scripts/make_package.cmd b/src/scripts/make_package.cmd
index 1037ea3..6f215fe 100644
--- a/src/scripts/make_package.cmd
+++ b/src/scripts/make_package.cmd
@@ -6,6 +6,6 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./make_package.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
diff --git a/src/scripts/make_win32.cmd b/src/scripts/make_win32.cmd
index 038141f..2a7ef7e 100644
--- a/src/scripts/make_win32.cmd
+++ b/src/scripts/make_win32.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call setup_msys2.cmd "%ARG1%" "%ARG2%" "%ARG3%"
   if exist "cleanup.cmd" (
     call cleanup.cmd "%ARG1%" "%ARG2%" "%ARG3%" 1 0
diff --git a/src/scripts/run_tests.cmd b/src/scripts/run_tests.cmd
index 53e9f54..fd809a0 100644
--- a/src/scripts/run_tests.cmd
+++ b/src/scripts/run_tests.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./run_tests.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
 
diff --git a/src/scripts/setup_msys2.cmd b/src/scripts/setup_msys2.cmd
index ce3c466..b13165b 100644
--- a/src/scripts/setup_msys2.cmd
+++ b/src/scripts/setup_msys2.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3
 
-pushd "%~dp0%"
+pushd "%~dp0"
   call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0
   call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
diff --git a/update_project.cmd b/update_project.cmd
index 064b37d..410d3b4 100644
--- a/update_project.cmd
+++ b/update_project.cmd
@@ -2,7 +2,9 @@
 
 setlocal
 
-pushd "%~dp0%"
-for /f "usebackq tokens=*" %%i in (`cygpath "%2"`) do set ARG1=%%i
-call mingw64 -no-start ./update_project.sh "%1" "%ARG1%"
+pushd "%~dp0"
+for /f "usebackq tokens=*" %%i in (`cygpath "%~2"`) do set ARG1=%%i
+call mingw64 -no-start ./update_project.sh "%~1" "%ARG1%"
 popd
+
+endlocal