From 78a9711447c1d3db0168bd4a8e6161754690a084 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 12 Apr 2018 21:05:38 -0400 Subject: [PATCH 1/6] fix unreg cleanup --- launcher/src/CmderLauncher.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 6e3c923..9481047 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -334,6 +334,7 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName) HKEY cmderKey; FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL)); FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL)); + RegDeleteKeyEx(root, keyBaseName, KEY_ALL_ACCESS, NULL); RegCloseKey(cmderKey); RegCloseKey(root); } From bc72f20a2d189e06716dd3dd6cb3f429893a22b2 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 12 Apr 2018 21:06:00 -0400 Subject: [PATCH 2/6] reposition echo --- vendor/init.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/init.bat b/vendor/init.bat index 0db4741..380100a 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -302,8 +302,8 @@ if defined CMDER_USER_CONFIG ( ) if not exist "%initialConfig%" ( - ( echo Creating user startup file: "%initialConfig%" + ( echo :: use this file to run your own startup commands echo :: use in front of the command to prevent printing the command echo. From 063f30c1936c931ea5b04013b55625a8a5242539 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 12 Apr 2018 21:32:38 -0400 Subject: [PATCH 3/6] fix git missing error on cmder mini cmd shell --- vendor/lib/lib_console.cmd | 1 - vendor/lib/lib_git.cmd | 25 +++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/vendor/lib/lib_console.cmd b/vendor/lib/lib_console.cmd index 38f40b4..d94561b 100644 --- a/vendor/lib/lib_console.cmd +++ b/vendor/lib/lib_console.cmd @@ -76,5 +76,4 @@ exit /b :::------------------------------------------------------------------------------- echo ERROR: %~1 - echo CMDER Shell Initialization has Failed! exit /b diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd index 7ff9562..ce3d0c8 100644 --- a/vendor/lib/lib_git.cmd +++ b/vendor/lib/lib_git.cmd @@ -45,20 +45,17 @@ exit /b %lib_console% debug-output :read_version "Env Var - git_executable=%git_executable%" :: check if the executable actually exists - if not exist "%git_executable%" ( - %lib_console% show_error "%git_executable%" does not exist! - exit /b -255 - ) - - :: get the git version in the provided directory - for /F "tokens=1,2,3 usebackq" %%A in (`"%git_executable%" --version 2^>nul`) do ( - if /i "%%A %%B" == "git version" ( - set "GIT_VERSION_%~1=%%C" - %lib_console% debug-output :read_version "Env Var - GIT_VERSION_%~1=%%C" - ) else ( - %lib_console% show_error "git --version" returned an inproper version string! - pause - exit /b + if exist "%git_executable%" ( + :: get the git version in the provided directory + for /F "tokens=1,2,3 usebackq" %%A in (`"%git_executable%" --version 2^>nul`) do ( + if /i "%%A %%B" == "git version" ( + set "GIT_VERSION_%~1=%%C" + %lib_console% debug-output :read_version "Env Var - GIT_VERSION_%~1=%%C" + ) else ( + %lib_console% show_error "git --version" returned an inproper version string! + pause + exit /b + ) ) ) From b8890ed29771180e9074685ba1369c80897e54a3 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 12 Apr 2018 21:39:52 -0400 Subject: [PATCH 4/6] switch to debug output --- vendor/lib/lib_git.cmd | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd index ce3d0c8..54b4e80 100644 --- a/vendor/lib/lib_git.cmd +++ b/vendor/lib/lib_git.cmd @@ -45,17 +45,20 @@ exit /b %lib_console% debug-output :read_version "Env Var - git_executable=%git_executable%" :: check if the executable actually exists - if exist "%git_executable%" ( - :: get the git version in the provided directory - for /F "tokens=1,2,3 usebackq" %%A in (`"%git_executable%" --version 2^>nul`) do ( - if /i "%%A %%B" == "git version" ( - set "GIT_VERSION_%~1=%%C" - %lib_console% debug-output :read_version "Env Var - GIT_VERSION_%~1=%%C" - ) else ( - %lib_console% show_error "git --version" returned an inproper version string! - pause - exit /b - ) + if not exist "%git_executable%" ( + %lib_console% debug-output :reda_version "%git_executable% does not exist." + exit /b -255 + ) + + :: get the git version in the provided directory + for /F "tokens=1,2,3 usebackq" %%A in (`"%git_executable%" --version 2^>nul`) do ( + if /i "%%A %%B" == "git version" ( + set "GIT_VERSION_%~1=%%C" + %lib_console% debug-output :read_version "Env Var - GIT_VERSION_%~1=%%C" + ) else ( + %lib_console% show_error "git --version" returned an inproper version string! + pause + exit /b ) ) From 12e37610177778d6647be3985b5a95e773126a08 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 12 Apr 2018 21:41:42 -0400 Subject: [PATCH 5/6] fix tab --- launcher/src/CmderLauncher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 9481047..f417764 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -334,7 +334,7 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName) HKEY cmderKey; FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL)); FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL)); - RegDeleteKeyEx(root, keyBaseName, KEY_ALL_ACCESS, NULL); + RegDeleteKeyEx(root, keyBaseName, KEY_ALL_ACCESS, NULL); RegCloseKey(cmderKey); RegCloseKey(root); } From 2a18ba084cdc0346bbac03736fac71bbcb0bf3df Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 12 Apr 2018 21:43:31 -0400 Subject: [PATCH 6/6] fix spelling --- vendor/lib/lib_git.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd index 54b4e80..19fb98a 100644 --- a/vendor/lib/lib_git.cmd +++ b/vendor/lib/lib_git.cmd @@ -46,7 +46,7 @@ exit /b :: check if the executable actually exists if not exist "%git_executable%" ( - %lib_console% debug-output :reda_version "%git_executable% does not exist." + %lib_console% debug-output :read_version "%git_executable% does not exist." exit /b -255 )