mirror of
https://github.com/cmderdev/cmder.git
synced 2025-11-29 18:19:41 +08:00
Merge pull request #3053 from daxgames/cmder-micro-tasks
Cmder micro tasks
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
## Config
|
## Config
|
||||||
|
|
||||||
All config files must be in this folder. If there is no option to set this folder
|
All config files must be in this folder. If there is no option to set this folder
|
||||||
directly, it has to be hardlinked.
|
directly, it has to be hardlinked.
|
||||||
|
|
||||||
* `user_aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
|
* `user_aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
|
||||||
|
|||||||
@@ -451,7 +451,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr
|
|||||||
{
|
{
|
||||||
MessageBox(NULL,
|
MessageBox(NULL,
|
||||||
(GetLastError() == ERROR_ACCESS_DENIED)
|
(GetLastError() == ERROR_ACCESS_DENIED)
|
||||||
? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
|
? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
|
||||||
: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
|
: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@@ -858,6 +858,11 @@ cmderOptions GetOption()
|
|||||||
cmderOptions.cmderTask = szArgList[i + 1];
|
cmderOptions.cmderTask = szArgList[i + 1];
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
else if ((_wcsicmp(L"bash", szArgList[i]) == 0 || _wcsicmp(L"powershell", szArgList[i]) == 0) || PathFileExists(windowsTerminalDir) || PathFileExists(conEmuDir))
|
||||||
|
{
|
||||||
|
cmderOptions.cmderTask = szArgList[i];
|
||||||
|
i++;
|
||||||
|
}
|
||||||
else if (_wcsicmp(L"/title", szArgList[i]) == 0 && !PathFileExists(windowsTerminalDir) && PathFileExists(conEmuDir))
|
else if (_wcsicmp(L"/title", szArgList[i]) == 0 && !PathFileExists(windowsTerminalDir) && PathFileExists(conEmuDir))
|
||||||
{
|
{
|
||||||
cmderOptions.cmderTitle = szArgList[i + 1];
|
cmderOptions.cmderTitle = szArgList[i + 1];
|
||||||
|
|||||||
Reference in New Issue
Block a user