Cmder development changes #2898

DRSDavidSoft · 2023-11-21T00:34:08Z

No description provided.

…speed_2

…g Cmder - Mini

Sync with master

Development BUG - Fixes launcher overwriting or not backing up terminal emulator settings in development branch.

* origin/cmder4win: cleanup cleanup cleanup not set origin/fix_launcher_overwrite cleanup respect PATHEXT instead of hardcoding our own value add missing qualified dir cleanup prevent warnings if the dir does not exist enable `/d` flag in `excd` by default fix conflict add notes on what shim actually is ⬆️ Update dependencies (git-for-windows v2.47.0.windows.1, clink v1.7.3, clink-completions v0.6.0) make library comments consistent and clean up code Use single quotes inside double quotes modify the header to remove outdated mention add vendor/bin/create-cmdercfg.cmd

Development BUG - Fixes launcher overwriting or not backing up terminal emulator settings in development branch.

* upstream-development: CHANGELOG.md CHANGELOG.md

Cmder for Windows - Add `Bash`, `Powershell`, `mintty`.

Copilot

Pull Request Overview

Add support for Windows Terminal alongside ConEmu and enable packing/building specific terminals via a new -terminal option. Updates include:

Introduce -terminal parameter in pack.ps1 and build.ps1 to select which emulator artifacts to include.
Extend the C++ launcher (CmderLauncher.cpp) to detect and launch Windows Terminal, migrate config logic, and rename conEmu references to generic terminal.
Update CI workflow to produce and upload separate artifacts for each terminal type and adjust documentation and packaging rules.

Reviewed Changes

Copilot reviewed 11 out of 30 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
scripts/pack.ps1	Added `$terminal` param and conditional target sets; duplicate branch.
scripts/build.ps1	Added `$terminal` param, Windows Terminal backup/restore logic; used `return` inside loop.
packignore	Include new `config\user_*` pattern.
launcher/src/strings.rc2	Updated switch help to include Windows Terminal flags.
launcher/src/resource.rc	Adjusted `#endif` comment label.
launcher/src/CmderLauncher.cpp	Renamed variables and added Windows Terminal detection/logic; scattered typos and grouping bug.
launcher/CmderLauncher.vcxproj	Added icon image entry to project.
README.md	Updated usage docs to use `--` instead of `/X`.
Cmder.bat	Dispatch to ConEmu or Windows Terminal based on existence.
CHANGELOG.md	Added unreleased section documenting the new Windows Terminal support.
.github/workflows/build.yml	Updated build steps to pass `-terminal` and upload new artifacts.

Copilot · 2025-07-02T02:21:24Z

scripts/pack.ps1

+} elseif ($terminal -eq "windows-terminal") {
+    $targets = @{
+      "cmder.7z"       = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\windows-terminal`"";
+      "cmder.zip"      = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\windows-terminal`"";
+      "cmder_mini.zip" = "-xr!`"vendor\git-for-windows`" -xr!`"vendor\windows-terminal`"";


This branch duplicates the previous elseif for windows-terminal. It looks like one should target conemu-maximus5 instead of repeating windows-terminal.

Suggested change

} elseif ($terminal -eq "windows-terminal") {

$targets = @{

"cmder.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\windows-terminal`"";

"cmder.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\windows-terminal`"";

"cmder_mini.zip" = "-xr!`"vendor\git-for-windows`" -xr!`"vendor\windows-terminal`"";

} elseif ($terminal -eq "conemu-maximus5") {

$targets = @{

"cmder_conemu.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -myx=7 -mqs=on -xr!`"vendor\windows-terminal`"";

"cmder_conemu.zip" = "-mm=Deflate -mfb=128 -mpass=3 -xr!`"vendor\windows-terminal`"";

"cmder_conemu_mini.zip" = "-xr!`"vendor\git-for-windows`" -xr!`"vendor\windows-terminal`"";

Copilot · 2025-07-02T02:21:25Z

scripts/build.ps1

+          return
+        } elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") {
+          return
+        } elseif ($s.name -eq "windows-terminal" -and $terminal -eq  "conemu-maximus5") {
+          return


Using return inside the foreach ($s in $sources) loop will exit the entire script. Replace return with continue to skip only the current source.

Suggested change

return

} elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") {

return

} elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") {

return

continue

} elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") {

continue

} elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") {

continue

Copilot · 2025-07-02T02:21:25Z

launcher/src/CmderLauncher.cpp

+						MessageBox(NULL,
+							(GetLastError() == ERROR_ACCESS_DENIED)
+							? L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_%COMPUTERNAME%_settings.json! Access Denied."
+							: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_teerminal_%COMPUTERNAME%_settigns.json!", MB_TITLE, MB_ICONSTOP);


Typographical errors in this message: windows_teerminal should be windows_terminal, and settigns should be settings.

Suggested change

: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_teerminal_%COMPUTERNAME%_settigns.json!", MB_TITLE, MB_ICONSTOP);

: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_%COMPUTERNAME%_settings.json!", MB_TITLE, MB_ICONSTOP);

Copilot · 2025-07-02T02:21:25Z

launcher/src/CmderLauncher.cpp

@@ -638,26 +853,26 @@ cmderOptions GetOption()
 					MessageBox(NULL, szArgList[i + 1], L"/START - Folder does not exist!", MB_OK);
 				}
 			}
-			else if (_wcsicmp(L"/task", szArgList[i]) == 0)
+			else if (_wcsicmp(L"/task", szArgList[i]) == 0 || PathFileExists(windowsTerminalDir) || PathFileExists(conEmuDir))


The OR conditions will match whenever a terminal exists, not just on the /task flag. You likely want to group the checks as (_wcsicmp(...) == 0) && (PathFileExists(...) || ...) to avoid unintended matches.

Suggested change

else if (_wcsicmp(L"/task", szArgList[i]) == 0 || PathFileExists(windowsTerminalDir) || PathFileExists(conEmuDir))

else if (_wcsicmp(L"/task", szArgList[i]) == 0 && (PathFileExists(windowsTerminalDir) || PathFileExists(conEmuDir)))

DRSDavidSoft · 2025-07-02T02:32:44Z

@copilot Hmm, I appreciate the detailed review, I'll address the issues raised in a local branch.

daxgames and others added 30 commits February 10, 2023 19:19

optimize for speed

274cce1

add debugging of path adds

56f45a8

add vendor/user_init.optional.cmd

7e50f50

shared or user user_init.cmd

727a99b

Update to only collext cmder env vars

02154a8

auto generate cmd user_init.cmd

1e623ec

add cleanup of unused env vars

3a2e747

cleanup

9cbc184

Delete user_init.optional.cmd

615ba5f

prevent timer results every time.

f1e2fb5

add bypass

e0b6943

x

c4d9365

Merge branch 'master' of https://github.com/cmderdev/cmder into more_…

f08ad62

…speed_2

Document '--' command line argument

42568b7

Merge branch 'master' into more_speed_2

b46f726

Merge remote-tracking branch 'upstream/master' into more_speed_2

9a851da

don't error if vim slias exists

b2135cd

Merge remote-tracking branch 'origin/more_speed_2' into more_speed_2

dac3090

Merge remote-tracking branch 'upstream/master' into more_speed_2

7b55dab

Add ability to launch git bash from external Installed git whwen usin…

86b9fb2

…g Cmder - Mini

Merge branch 'master' into more_speed_2

ea0a9bb

fix multiuser user_init.cmd creation

4bf6598

fixes

294f85e

sync

3ca0379

cleanup

cd92c9f

Merge remote-tracking branch 'upstream/master' into more_speed_2

5311b25

'.gitignore

3ced7a2

add comment to clink.lua explaining /c [folderpath]

4129084

Merge pull request #14 from cmderdev/master

b47cf43

Sync with master

Merge remote-tracking branch 'upstream/master' into more_speed_2

9b446b3

daxgames and others added 15 commits January 5, 2025 13:01

Merge pull request #24 from daxgames/fix_launcher_overwrite-2

6cf4a42

Development BUG - Fixes launcher overwriting or not backing up terminal emulator settings in development branch.

Merge branch 'origin-development-dax' into cmder4win

bd3f132

CHANGELOG.md

0c2e5ce

CHANGELOG.md

e0aa20a

CHANGELOG.md

0634969

CHANGELOG.md

b412036

add executionpolicy bypass

d349f57

Remove /a switch and associated code.

8683dad

Merge pull request #2988 from daxgames/fix_launcher_overwrite-2

15d5618

Development BUG - Fixes launcher overwriting or not backing up terminal emulator settings in development branch.

Merge branch 'upstream-development' into cmder4win

c1bbc46

* upstream-development: CHANGELOG.md CHANGELOG.md

Merge pull request #2942 from daxgames/cmder4win

7ac805c

Cmder for Windows - Add `Bash`, `Powershell`, `mintty`.

fix build script

6d82cf8

Update build.yml

a44b30c

Merge branch 'master' into development

e3fc1a1

DRSDavidSoft changed the title ~~Cmder 1.4 development changes~~ Cmder development changes Apr 8, 2025

DRSDavidSoft and others added 4 commits April 8, 2025 10:04

Merge branch 'master' into development

8b004be

revert inadvertent changes

2868f9e

indentation cleanup and comment fix

df42ff2

revert inadvertent changes

aa156a2

DRSDavidSoft requested a review from Copilot July 2, 2025 02:19

DRSDavidSoft added the 🎨 Type: Enhancement label Jul 2, 2025

DRSDavidSoft added this to the 1.4 milestone Jul 2, 2025

Copilot AI reviewed Jul 2, 2025

View reviewed changes

DRSDavidSoft requested review from a team July 2, 2025 02:24

DRSDavidSoft marked this pull request as draft July 2, 2025 02:24

DRSDavidSoft removed request for a team July 2, 2025 02:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Cmder development changes #2898

Cmder development changes #2898

Uh oh!

DRSDavidSoft commented Nov 21, 2023

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jul 2, 2025

Uh oh!

Copilot AI Jul 2, 2025

Uh oh!

Copilot AI Jul 2, 2025

Uh oh!

Copilot AI Jul 2, 2025

Uh oh!

DRSDavidSoft commented Jul 2, 2025

Uh oh!

Uh oh!

	: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_teerminal_%COMPUTERNAME%_settigns.json!", MB_TITLE, MB_ICONSTOP);
	: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_%COMPUTERNAME%_settings.json!", MB_TITLE, MB_ICONSTOP);

	else if (_wcsicmp(L"/task", szArgList[i]) == 0 \|\| PathFileExists(windowsTerminalDir) \|\| PathFileExists(conEmuDir))
	else if (_wcsicmp(L"/task", szArgList[i]) == 0 && (PathFileExists(windowsTerminalDir) \|\| PathFileExists(conEmuDir)))

Cmder development changes #2898

Are you sure you want to change the base?

Cmder development changes #2898

Uh oh!

Conversation

DRSDavidSoft commented Nov 21, 2023

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

DRSDavidSoft commented Jul 2, 2025

Uh oh!

Uh oh!