From 72b676b939053267234995622119293ff5c05092 Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Sat, 10 Nov 2018 06:42:27 -0500 Subject: [PATCH] Revert "Ignore `%cmder_root%\config` (#1945)" This reverts commit 637b0fd3acf1554818cc5ac34bfaf006bffcffcc. --- .gitignore | 13 ++- .../ConEmu.xml.default => config/ConEmu.xml | 0 launcher/src/CmderLauncher.cpp | 92 ++++++------------- 3 files changed, 34 insertions(+), 71 deletions(-) rename vendor/ConEmu.xml.default => config/ConEmu.xml (100%) diff --git a/.gitignore b/.gitignore index ac64e10..3243549 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,27 @@ ## Those files should be taken from their repositary -bin/* +bin/*/* !bin/Readme.md - vendor/*/* !vendor/bin/* !vendor/lib/* !vendor/* !vendor/psmodules/PsGet -config/* -!config/Readme.md - +config/.history Thumbs.db *.exe *.dll build/ Version v* *.bak +config/user-* +config/user_* +config/*.lua +config/settings +config/aliases +config/profile.d .github_changelog_generator launcher/.vs launcher/src/version.rc2 diff --git a/vendor/ConEmu.xml.default b/config/ConEmu.xml similarity index 100% rename from vendor/ConEmu.xml.default rename to config/ConEmu.xml diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 6d81411..7bd1b21 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -110,12 +110,8 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr PathCombine(configDirPath, exeDir, L"config"); - /* - Convert legacy user-profile.cmd to new name user_profile.cmd - */ PathCombine(legacyUserProfilePath, configDirPath, L"user-profile.cmd"); - if (PathFileExists(legacyUserProfilePath)) - { + if (PathFileExists(legacyUserProfilePath)) { PathCombine(userProfilePath, configDirPath, L"user_profile.cmd"); char *lPr = (char *)malloc(MAX_PATH); @@ -128,12 +124,8 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr rename(lPr, pR); } - /* - Convert legacy user-aliases.cmd to new name user_aliases.cmd - */ PathCombine(legacyUserAliasesPath, configDirPath, L"user-aliases.cmd"); - if (PathFileExists(legacyUserAliasesPath)) - { + if (PathFileExists(legacyUserAliasesPath)) { PathCombine(userAliasesPath, configDirPath, L"user_aliases.cmd"); char *lPr = (char *)malloc(MAX_PATH); @@ -145,18 +137,13 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr userAliasesPath, (size_t)MAX_PATH); rename(lPr, pR); } - - /* - Was -c [path] specified? - */ + if (wcscmp(userConfigDirPath, L"") == 0) { - // No - It wasn't. PathCombine(userConfigDirPath, exeDir, L"config"); } else { - // Yes - It was. PathCombine(userBinDirPath, userConfigDirPath, L"bin"); SHCreateDirectoryEx(0, userBinDirPath, 0); @@ -165,13 +152,9 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr PathCombine(userProfiledDirPath, userConfigDirPath, L"profile.d"); SHCreateDirectoryEx(0, userProfiledDirPath, 0); - - /* - Convert legacy user-profile.cmd to new name user_profile.cmd - */ + PathCombine(legacyUserProfilePath, userConfigDirPath, L"user-profile.cmd"); - if (PathFileExists(legacyUserProfilePath)) - { + if (PathFileExists(legacyUserProfilePath)) { PathCombine(userProfilePath, userConfigDirPath, L"user_profile.cmd"); char *lPr = (char *)malloc(MAX_PATH); @@ -184,12 +167,8 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr rename(lPr, pR); } - /* - Convert legacy user-aliases.cmd to new name user_aliases.cmd - */ PathCombine(legacyUserAliasesPath, userConfigDirPath, L"user-aliases.cmd"); - if (PathFileExists(legacyUserAliasesPath)) - { + if (PathFileExists(legacyUserAliasesPath)) { PathCombine(userAliasesPath, userConfigDirPath, L"user_aliases.cmd"); char *lPr = (char *)malloc(MAX_PATH); @@ -207,19 +186,15 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml"); // Set path to Cmder default ConEmu config file - PathCombine(defaultCfgPath, exeDir, L"config\\vendor\\ConEmu.xml.default"); + PathCombine(defaultCfgPath, exeDir, L"config\\ConEmu.xml"); // Check for machine-specific then user config source file. PathCombine(cpuCfgPath, userConfigDirPath, L"ConEmu-%COMPUTERNAME%.xml"); ExpandEnvironmentStrings(cpuCfgPath, cpuCfgPath, sizeof(cpuCfgPath) / sizeof(cpuCfgPath[0])); - // Set path to Cmder user ConEmu config file PathCombine(userCfgPath, userConfigDirPath, L"user-ConEmu.xml"); - - if (PathFileExists(cpuCfgPath)) // If machine-specific ConEmu config file exists - use it. - { - if (PathFileExists(cfgPath)) // If vendor ConEmu config file exists - back it up to config/ConEmu-%COMPUTERNAME%.xml. - { + if (PathFileExists(cpuCfgPath)) { + if (PathFileExists(cfgPath)) { if (!CopyFile(cfgPath, cpuCfgPath, FALSE)) { MessageBox(NULL, @@ -229,7 +204,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr exit(1); } } - else // If vendor ConEmu config file does not exists - Copy machine-specific config/ConEmu-%COMPUTERNAME%.xml to vendor ConEmu.xml file + else { if (!CopyFile(cpuCfgPath, cfgPath, FALSE)) { @@ -241,10 +216,8 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr } } } - else if (PathFileExists(userCfgPath)) // If config/user_conemu.xml exists use it. - { - if (PathFileExists(cfgPath)) // If vendor conemu.xml exits back it up to config/user_conemu.xml. - { + else if (PathFileExists(userCfgPath)) { + if (PathFileExists(cfgPath)) { if (!CopyFile(cfgPath, userCfgPath, FALSE)) { MessageBox(NULL, @@ -254,7 +227,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr exit(1); } } - else // If vendor conemu.xml does not exist copy user_conemu.xml to vendor conemu.xml + else { if (!CopyFile(userCfgPath, cfgPath, FALSE)) { @@ -266,8 +239,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr } } } - else if (PathFileExists(cfgPath)) // If vendor conemu.xml exists copy config/user_conemu.xml - { + else if (PathFileExists(cfgPath)) { if (!CopyFile(cfgPath, userCfgPath, FALSE)) { MessageBox(NULL, @@ -277,8 +249,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr exit(1); } } - else // No previous conemu.xml config exists use the default. - { + else { if (!CopyFile(defaultCfgPath, cfgPath, FALSE)) { MessageBox(NULL, @@ -291,34 +262,28 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr SYSTEM_INFO sysInfo; GetNativeSystemInfo(&sysInfo); - if (sysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) - { + if (sysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu64.exe"); } - else - { + else { PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe"); } if (is_single_mode) { - if (!streqi(cmderTask.c_str(), L"")) - { + if (!streqi(cmderTask.c_str(), L"")) { swprintf_s(args, L"%s /single /Icon \"%s\" /Title Cmder /dir \"%s\" /run {%s}", args, icoPath, cmderStart.c_str(), cmderTask.c_str()); } - else - { + else { swprintf_s(args, L"%s /single /Icon \"%s\" /Title Cmder /dir \"%s\"", args, icoPath, cmderStart.c_str()); } } else { - if (!streqi(cmderTask.c_str(), L"")) - { + if (!streqi(cmderTask.c_str(), L"")) { swprintf_s(args, L"/Icon \"%s\" /Title Cmder /dir \"%s\" /run {%s}", icoPath, cmderStart.c_str(), cmderTask.c_str()); } - else - { + else { swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder /dir \"%s\"", args, icoPath, cmderStart.c_str()); } } @@ -470,8 +435,7 @@ cmderOptions GetOption() cmderOptions.cmderCfgRoot = cmderCfgRoot; - if (szArgList[i + 1] != NULL && szArgList[i + 1][0] != '/') - { + if (szArgList[i + 1] != NULL && szArgList[i + 1][0] != '/') { cmderOptions.cmderCfgRoot = szArgList[i + 1]; i++; } @@ -489,8 +453,7 @@ cmderOptions GetOption() cmderOptions.cmderStart = szArgList[i + 1]; i++; } - else - { + else { MessageBox(NULL, szArgList[i + 1], L"/START - Folder does not exist!", MB_OK); } } @@ -542,13 +505,11 @@ cmderOptions GetOption() cmderOptions.cmderStart = szArgList[i]; i++; } - else - { + else { MessageBox(NULL, szArgList[i], L"Folder does not exist!", MB_OK); } } - else - { + else { MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] | [Start in Path]]\n\n /single\n\nor\n\n /register [USER | ALL]\n\nor\n\n /unregister [USER | ALL]\n", MB_TITLE, MB_OK); cmderOptions.error = true; } @@ -570,8 +531,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, cmderOptions cmderOptions = GetOption(); - if (cmderOptions.registerApp == true) - { + if (cmderOptions.registerApp == true) { RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND); RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM); }