Skip to content

Commit 13904e4

Browse files
authored
Merge pull request #3053 from daxgames/cmder-micro-tasks
Cmder micro tasks
2 parents 480b638 + 974f5b0 commit 13904e4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

config/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Config
22

3-
All config files must be in this folder. If there is no option to set this folder
3+
All config files must be in this folder. If there is no option to set this folder
44
directly, it has to be hardlinked.
55

66
* `user_aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from

launcher/src/CmderLauncher.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
451451
{
452452
MessageBox(NULL,
453453
(GetLastError() == ERROR_ACCESS_DENIED)
454-
? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
454+
? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
455455
: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
456456
exit(1);
457457
}
@@ -858,6 +858,11 @@ cmderOptions GetOption()
858858
cmderOptions.cmderTask = szArgList[i + 1];
859859
i++;
860860
}
861+
else if ((_wcsicmp(L"bash", szArgList[i]) == 0 || _wcsicmp(L"powershell", szArgList[i]) == 0) || PathFileExists(windowsTerminalDir) || PathFileExists(conEmuDir))
862+
{
863+
cmderOptions.cmderTask = szArgList[i];
864+
i++;
865+
}
861866
else if (_wcsicmp(L"/title", szArgList[i]) == 0 && !PathFileExists(windowsTerminalDir) && PathFileExists(conEmuDir))
862867
{
863868
cmderOptions.cmderTitle = szArgList[i + 1];

0 commit comments

Comments
 (0)