2024.08.27:

* fixed: _config/*/config.0.vars.in: reverted default value for `MSYS*_ROOT` variables * fixed: src/scripts: copy/copy_file_to_files_by_list.bat, scm/shell/shell_mklink_by_list.bat, scm/shell/shell_copy_by_list.bat: preserve all attributes in case of `msys` and `cygwin` usage * fixed: src/scripts/copy/copy_file_to_files_by_list.bat, src/scripts/scm/shell/*.bat, src/scripts/terminal/run_msys_bash.bat: correct `MSYS_ROOT` usage * fixed: src/scripts/scm/shell: shell_copy_by_list.bat, shell_move_by_list.bat: minor fixup * refactor: src/scripts/scm/shell/*.bat, src/scripts/terminal/run_*.bat: minor refactor
andry81 · Aug 27, 2024 · 34a422f · 34a422f
1 parent e89a99f
commit 34a422f
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 43 deletions.
diff --git a/_config/_common/config.0.vars.in b/_config/_common/config.0.vars.in
@@ -50,9 +50,9 @@ NPP_EDITOR                                  ="{{NPP_EDITOR}}"
 BASIC_TEXT_EDITOR                           =notepad.exe
 
 # "c:\msys32\usr"
-MSYS32_ROOT                                 ="{{MSYS32_ROOT}}\usr"
+MSYS32_ROOT                                 ="{{MSYS32_ROOT}}"
 # "c:\msys64\usr"
-MSYS64_ROOT                                 ="{{MSYS64_ROOT}}\usr"
+MSYS64_ROOT                                 ="{{MSYS64_ROOT}}"
 
 MSYS32_MINTTY_TERMINAL_PREFIX               ="%MSYS32_ROOT%\usr\bin\mintty.exe"
 MSYS64_MINTTY_TERMINAL_PREFIX               ="%MSYS64_ROOT%\usr\bin\mintty.exe"

diff --git a/_config/winxp/config.0.vars.in b/_config/winxp/config.0.vars.in
@@ -50,9 +50,9 @@ NPP_EDITOR                                  ="{{NPP_EDITOR}}"
 BASIC_TEXT_EDITOR                           =notepad.exe
 
 # "c:\msys32\usr"
-MSYS32_ROOT                                 ="{{MSYS32_ROOT}}\usr"
+MSYS32_ROOT                                 ="{{MSYS32_ROOT}}"
 # "c:\msys64\usr"
-MSYS64_ROOT                                 ="{{MSYS64_ROOT}}\usr"
+MSYS64_ROOT                                 ="{{MSYS64_ROOT}}"
 
 MSYS32_MINTTY_TERMINAL_PREFIX               ="%MSYS32_ROOT%\usr\bin\mintty.exe"
 MSYS64_MINTTY_TERMINAL_PREFIX               ="%MSYS64_ROOT%\usr\bin\mintty.exe"

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,10 @@
+2024.08.27:
+* fixed: _config/*/config.0.vars.in: reverted default value for `MSYS*_ROOT` variables
+* fixed: src/scripts: copy/copy_file_to_files_by_list.bat, scm/shell/shell_mklink_by_list.bat, scm/shell/shell_copy_by_list.bat: preserve all attributes in case of `msys` and `cygwin` usage
+* fixed: src/scripts/copy/copy_file_to_files_by_list.bat, src/scripts/scm/shell/*.bat, src/scripts/terminal/run_msys_bash.bat: correct `MSYS_ROOT` usage
+* fixed: src/scripts/scm/shell: shell_copy_by_list.bat, shell_move_by_list.bat: minor fixup
+* refactor: src/scripts/scm/shell/*.bat, src/scripts/terminal/run_*.bat: minor refactor
+
 2024.08.25:
 * changed: deploy/totalcmd/Profile/wincmd.ini.in: more directory excludes for totalcmd search template
 

diff --git a/src/scripts/copy/copy_file_to_files_by_list.bat b/src/scripts/copy/copy_file_to_files_by_list.bat
@@ -77,9 +77,9 @@ if %FLAG_USE_SHELL_MSYS% EQU 0 goto SKIP_USE_SHELL_MSYS
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_msys.bat" || exit /b 255
 
-if defined MSYS_ROOT if exist "%MSYS_ROOT%\bin\*" goto MSYS_OK
+if defined MSYS_ROOT if exist "%MSYS_ROOT%\usr\bin\*" goto MSYS_OK
 (
-  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or not valid: "%MSYS_ROOT%".
+  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or path is not valid: "%MSYS_ROOT%\usr\bin".
   exit /b 255
 ) >&2
 
@@ -92,7 +92,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_cygwin.bat" || exit /b 255
 
 if defined CYGWIN_ROOT if exist "%CYGWIN_ROOT%\bin\*" goto CYGWIN_OK
 (
-  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or not valid: "%CYGWIN_ROOT%".
+  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or path is not valid: "%CYGWIN_ROOT%\bin".
   exit /b 255
 ) >&2
 
@@ -175,9 +175,9 @@ exit /b 0
 :COPY_FILE
 echo."%~1" -^> "%~2"
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
-  "%MSYS_ROOT%/bin/cp.exe" --preserve=timestamps "%~f1" "%~f2" || exit /b
+  "%MSYS_ROOT%/usr/bin/cp.exe" --preserve "%~f1" "%~f2" || exit /b
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
-  "%CYGWIN_ROOT%/bin/cp.exe" --preserve=timestamps "%~f1" "%~f2" || exit /b
+  "%CYGWIN_ROOT%/bin/cp.exe" --preserve "%~f1" "%~f2" || exit /b
 ) else call :COPY_FILE_IMPL /B /Y "%%~f1" "%%~f2" || exit /b
 exit /b 0
 

diff --git a/src/scripts/scm/shell/shell_copy_by_list.bat b/src/scripts/scm/shell/shell_copy_by_list.bat
@@ -98,9 +98,9 @@ if %FLAG_USE_SHELL_MSYS% EQU 0 goto SKIP_USE_SHELL_MSYS
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_msys.bat" || exit /b 255
 
-if defined MSYS_ROOT if exist "%MSYS_ROOT%\bin\*" goto MSYS_OK
+if defined MSYS_ROOT if exist "%MSYS_ROOT%\usr\bin\*" goto MSYS_OK
 (
-  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or not valid: "%MSYS_ROOT%".
+  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or path is not valid: "%MSYS_ROOT%\usr\bin".
   exit /b 255
 ) >&2
 
@@ -113,7 +113,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_cygwin.bat" || exit /b 255
 
 if defined CYGWIN_ROOT if exist "%CYGWIN_ROOT%\bin\*" goto CYGWIN_OK
 (
-  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or not valid: "%CYGWIN_ROOT%".
+  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or path is not valid: "%CYGWIN_ROOT%\bin".
   exit /b 255
 ) >&2
 
@@ -208,14 +208,21 @@ set "PREV_FILE_PATH="
 for /F "usebackq tokens=* delims= eol=#" %%i in ("%REVERSED_INPUT_LIST_FILE_TMP%") do (
   set "FILE_PATH=%%i"
   call :FILTER_UNIQUE_PATHS
-  set "PREV_FILE_PATH=%%i"
+  call set "PREV_FILE_PATH=%%FILE_PATH%%"
 )
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/shell_copy_file_log.bat" "%%REVERSED_UNIQUE_LIST_FILE_TMP%%" "%%PROJECT_LOG_DIR%%/%%REVERSED_UNIQUE_LIST_FILE_NAME_TMP%%"
 
 goto FILTER_UNIQUE_PATHS_END
 
 :FILTER_UNIQUE_PATHS
+if not defined FILE_PATH exit /b 1
+
+rem avoid any quote characters
+set "FILE_PATH=%FILE_PATH:"=%"
+
+for /F "eol= tokens=* delims=" %%i in ("%FILE_PATH%\.") do set "FILE_PATH=%%~fi"
+
 if defined PREV_FILE_PATH goto CONTINUE_FILTER_UNIQUE_PATHS_1
 
 if /i "%FILE_PATH%" == "%PREV_FILE_PATH%" exit /b 0
@@ -673,7 +680,7 @@ if not exist "\\?\%TO_FILE_DIR%\*" (
     call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/mkdir.bat" "%%TO_FILE_DIR%%" || exit /b
   ) else if %FLAG_USE_SHELL_MSYS% NEQ 0 (
     echo.
-    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mkdir.exe" -p "%%TO_FILE_DIR%%"
+    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mkdir.exe" -p "%%TO_FILE_DIR%%"
   ) else (
     echo.
     call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/mkdir.exe" -p "%%TO_FILE_DIR%%"
@@ -737,11 +744,11 @@ if %FROM_FILE_PATH_AS_DIR% NEQ 0 goto XCOPY_FROM_FILE_PATH_AS_DIR
 
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% --preserve=timestamps "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% --preserve "%%FROM_FILE_PATH%%" "%%TO_FILE_DIR%%" || exit /b 40
   goto SCM_ADD_COPY
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% --preserve=timestamps "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 41
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% --preserve "%%FROM_FILE_PATH%%" "%%TO_FILE_DIR%" || exit /b 41
   goto SCM_ADD_COPY
 )
 
@@ -784,16 +791,16 @@ exit /b %LAST_ERROR%
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
   if %EXCLUDE_COPY_DIR_CONTENT% EQU 0 (
-    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% -R --preserve=timestamps "%%FROM_FILE_PATH%%/." "%%TO_FILE_PATH%%/" || exit /b 60
+    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% -R --preserve "%%FROM_FILE_PATH%%/." "%%TO_FILE_PATH%%/" || exit /b 60
   ) else (
-    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mkdir.exe" "%%TO_FILE_PATH%%" || exit /b 61
-    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/touch.exe" -r "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%"
+    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mkdir.exe" "%%TO_FILE_PATH%%" || exit /b 61
+    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/touch.exe" -r "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%"
   )
   goto SCM_ADD_COPY
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.
   if %EXCLUDE_COPY_DIR_CONTENT% EQU 0 (
-    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% -R --preserve=timestamps "%%FROM_FILE_PATH%%/." "%%TO_FILE_PATH%%/" || exit /b 65
+    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/cp.exe"%%XCOPY_CMD_BARE_FLAGS%% -R --preserve "%%FROM_FILE_PATH%%/." "%%TO_FILE_PATH%%/" || exit /b 65
   ) else (
     call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/mkdir.exe" "%%TO_FILE_PATH%%" || exit /b 66
     call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/touch.exe" -r "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%"

diff --git a/src/scripts/scm/shell/shell_mklink_by_list.bat b/src/scripts/scm/shell/shell_mklink_by_list.bat
@@ -80,9 +80,9 @@ if %FLAG_USE_SHELL_MSYS% EQU 0 goto SKIP_USE_SHELL_MSYS
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_msys.bat" || exit /b 255
 
-if defined MSYS_ROOT if exist "%MSYS_ROOT%\bin\*" goto MSYS_OK
+if defined MSYS_ROOT if exist "%MSYS_ROOT%\usr\bin\*" goto MSYS_OK
 (
-  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or not valid: "%MSYS_ROOT%".
+  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or path is not valid: "%MSYS_ROOT%\usr\bin".
   exit /b 255
 ) >&2
 
@@ -95,7 +95,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_cygwin.bat" || exit /b 255
 
 if defined CYGWIN_ROOT if exist "%CYGWIN_ROOT%\bin\*" goto CYGWIN_OK
 (
-  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or not valid: "%CYGWIN_ROOT%".
+  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or path is not valid: "%CYGWIN_ROOT%\bin".
   exit /b 255
 ) >&2
 
@@ -362,11 +362,11 @@ call "%%CONTOOLS_ROOT%%/filesys/subtract_path.bat" "%%FROM_FILE_PATH%%" "%%TO_FI
 :SHELL_MKLINK
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/cp.exe" -s --preserve=timestamps "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/cp.exe" -s --preserve "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
   exit /b 0
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/cp.exe" -s --preserve=timestamps "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 41
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/cp.exe" -s --preserve "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 41
   exit /b 0
 )
 

diff --git a/src/scripts/scm/shell/shell_move_by_list.bat b/src/scripts/scm/shell/shell_move_by_list.bat
@@ -86,9 +86,9 @@ if %FLAG_USE_SHELL_MSYS% EQU 0 goto SKIP_USE_SHELL_MSYS
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_msys.bat" || exit /b 255
 
-if defined MSYS_ROOT if exist "%MSYS_ROOT%\bin\*" goto MSYS_OK
+if defined MSYS_ROOT if exist "%MSYS_ROOT%\usr\bin\*" goto MSYS_OK
 (
-  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or not valid: "%MSYS_ROOT%".
+  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or path is not valid: "%MSYS_ROOT%\usr\bin".
   exit /b 255
 ) >&2
 
@@ -101,7 +101,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_cygwin.bat" || exit /b 255
 
 if defined CYGWIN_ROOT if exist "%CYGWIN_ROOT%\bin\*" goto CYGWIN_OK
 (
-  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or not valid: "%CYGWIN_ROOT%".
+  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or path is not valid: "%CYGWIN_ROOT%\bin".
   exit /b 255
 ) >&2
 
@@ -176,14 +176,21 @@ set "PREV_FILE_PATH="
 for /F "usebackq tokens=* delims= eol=#" %%i in ("%REVERSED_INPUT_LIST_FILE_TMP%") do (
   set "FILE_PATH=%%i"
   call :FILTER_UNIQUE_PATHS
-  set "PREV_FILE_PATH=%%i"
+  call set "PREV_FILE_PATH=%%FILE_PATH%%"
 )
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/shell_copy_file_log.bat" "%%REVERSED_UNIQUE_LIST_FILE_TMP%%" "%%PROJECT_LOG_DIR%%/%%REVERSED_UNIQUE_LIST_FILE_NAME_TMP%%"
 
 goto FILTER_UNIQUE_PATHS_END
 
 :FILTER_UNIQUE_PATHS
+if not defined FILE_PATH exit /b 1
+
+rem avoid any quote characters
+set "FILE_PATH=%FILE_PATH:"=%"
+
+for /F "eol= tokens=* delims=" %%i in ("%FILE_PATH%\.") do set "FILE_PATH=%%~fi"
+
 if defined PREV_FILE_PATH goto CONTINUE_FILTER_UNIQUE_PATHS_1
 
 if /i "%FILE_PATH%" == "%PREV_FILE_PATH%" exit /b 0
@@ -511,7 +518,7 @@ if not exist "\\?\%TO_FILE_DIR%\*" (
     call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/mkdir.bat" "%%TO_FILE_DIR%%" || exit /b
   ) else if %FLAG_USE_SHELL_MSYS% NEQ 0 (
     echo.
-    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mkdir.exe" -p "%%TO_FILE_DIR%%"
+    call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mkdir.exe" -p "%%TO_FILE_DIR%%"
   ) else (
     echo.
     call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%CYGWIN_ROOT%%/bin/mkdir.exe" -p "%%TO_FILE_DIR%%"
@@ -617,7 +624,7 @@ if %FROM_FILE_PATH_AS_DIR% NEQ 0 goto XMOVE_FROM_FILE_PATH_AS_DIR
 
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mv.exe"%%XMOVE_CMD_BARE_FLAGS%% "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mv.exe"%%XMOVE_CMD_BARE_FLAGS%% "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
   exit /b 0
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.
@@ -652,7 +659,7 @@ exit /b %LAST_ERROR%
 :XMOVE_FROM_FILE_PATH_AS_DIR
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mv.exe"%%XMOVE_CMD_BARE_FLAGS%% "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%/" || exit /b 60
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mv.exe"%%XMOVE_CMD_BARE_FLAGS%% "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%/" || exit /b 60
   exit /b 0
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.

diff --git a/src/scripts/scm/shell/shell_rename_by_list.bat b/src/scripts/scm/shell/shell_rename_by_list.bat
@@ -86,9 +86,9 @@ if %FLAG_USE_SHELL_MSYS% EQU 0 goto SKIP_USE_SHELL_MSYS
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_msys.bat" || exit /b 255
 
-if defined MSYS_ROOT if exist "%MSYS_ROOT%\bin\*" goto MSYS_OK
+if defined MSYS_ROOT if exist "%MSYS_ROOT%\usr\bin\*" goto MSYS_OK
 (
-  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or not valid: "%MSYS_ROOT%".
+  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or path is not valid: "%MSYS_ROOT%\usr\bin".
   exit /b 255
 ) >&2
 
@@ -101,7 +101,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_cygwin.bat" || exit /b 255
 
 if defined CYGWIN_ROOT if exist "%CYGWIN_ROOT%\bin\*" goto CYGWIN_OK
 (
-  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or not valid: "%CYGWIN_ROOT%".
+  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or path is not valid: "%CYGWIN_ROOT%\bin".
   exit /b 255
 ) >&2
 
@@ -456,7 +456,7 @@ if %FROM_FILE_PATH_AS_DIR% NEQ 0 goto XMOVE_FROM_FILE_PATH_AS_DIR
 
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mv.exe" "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mv.exe" "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%" || exit /b 40
   exit /b 0
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.
@@ -483,7 +483,7 @@ exit /b %LAST_ERROR%
 :XMOVE_FROM_FILE_PATH_AS_DIR
 if %FLAG_USE_SHELL_MSYS% NEQ 0 (
   echo.
-  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/bin/mv.exe" "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%/" || exit /b 60
+  call "%%CONTOOLS_BUILD_TOOLS_ROOT%%/call.bat" "%%MSYS_ROOT%%/usr/bin/mv.exe" "%%FROM_FILE_PATH%%" "%%TO_FILE_PATH%%/" || exit /b 60
   exit /b 0
 ) else if %FLAG_USE_SHELL_CYGWIN% NEQ 0 (
   echo.

diff --git a/src/scripts/terminal/run_cmd.bat b/src/scripts/terminal/run_cmd.bat
@@ -50,7 +50,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_mintty.bat" || exit /b 255
 if %USE_MINTTY% EQU 0 goto MINTTY_OK
 if defined MINTTY_ROOT if exist "%MINTTY_ROOT%\*" goto MINTTY_OK
 (
-  echo.%?~nx0%: error: `MINTTY_ROOT` variable is not defined or not valid: "%MINTTY_ROOT%"
+  echo.%?~nx0%: error: `MINTTY_ROOT` variable is not defined or path is not valid: "%MINTTY_ROOT%"
   exit /b 255
 ) >&2
 

diff --git a/src/scripts/terminal/run_cygwin_bash.bat b/src/scripts/terminal/run_cygwin_bash.bat
@@ -49,7 +49,7 @@ call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_cygwin.bat" || exit /b 255
 
 if defined CYGWIN_ROOT if exist "%CYGWIN_ROOT%\bin\*" goto CYGWIN_OK
 (
-  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or not valid: "%CYGWIN_ROOT%"
+  echo.%?~nx0%: error: `CYGWIN_ROOT` variable is not defined or path is not valid: "%CYGWIN_ROOT%\bin"
   exit /b 255
 ) >&2
 

diff --git a/src/scripts/terminal/run_msys_bash.bat b/src/scripts/terminal/run_msys_bash.bat
@@ -47,9 +47,9 @@ if %FLAG_USE_X32% NEQ 0 if defined PROCESSOR_ARCHITEW6432 (
 
 call "%%TACKLEBAR_PROJECT_ROOT%%/tools/init_msys.bat" || exit /b 255
 
-if defined MSYS_ROOT if exist "%MSYS_ROOT%\bin\*" goto MSYS_OK
+if defined MSYS_ROOT if exist "%MSYS_ROOT%\usr\bin\*" goto MSYS_OK
 (
-  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or not valid: "%MSYS_ROOT%"
+  echo.%?~nx0%: error: `MSYS_ROOT` variable is not defined or path is not valid: "%MSYS_ROOT%\usr\bin"
   exit /b 255
 ) >&2
 

diff --git a/tools/shell_copy_file_log.bat b/tools/shell_copy_file_log.bat
@@ -14,8 +14,8 @@ set "COPY_TO_FILE_PATH=%~f2"
 
 echo."%COPY_FROM_FILE_PATH%" -^> "%COPY_TO_FILE_PATH%"
 
-if %FLAG_USE_SHELL_MSYS%0 NEQ 0 ( "%MSYS_ROOT%/bin/cp.exe" -f --preserve=timestamps "%COPY_FROM_FILE_PATH%" "%COPY_TO_FILE_PATH%" & exit /b )
-if %FLAG_USE_SHELL_CYGWIN%0 NEQ 0 ( "%CYGWIN_ROOT%/bin/cp.exe" -f --preserve=timestamps "%COPY_FROM_FILE_PATH%" "%COPY_TO_FILE_PATH%" & exit /b )
+if %FLAG_USE_SHELL_MSYS%0 NEQ 0 ( "%MSYS_ROOT%/usr/bin/cp.exe" -f --preserve "%COPY_FROM_FILE_PATH%" "%COPY_TO_FILE_PATH%" & exit /b )
+if %FLAG_USE_SHELL_CYGWIN%0 NEQ 0 ( "%CYGWIN_ROOT%/bin/cp.exe" -f --preserve "%COPY_FROM_FILE_PATH%" "%COPY_TO_FILE_PATH%" & exit /b )
 
 type nul >> "\\?\%COPY_TO_FILE_PATH%"