From 3fab0c122cc4a5c50c8ba81164903d4c26d9c637 Mon Sep 17 00:00:00 2001 From: Jan Schulz Date: Sat, 13 Feb 2016 18:30:20 +0100 Subject: [PATCH 1/6] Add appveyor batch to README This is mainly to point people to newer builds of cmder and is therefore to be merged into the master branch. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d055ff8..b05dcf4 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ So, you've experimented with cmder a little and want to give it a shot in a more 1. Open a terminal as an Administrator 2. Navigate to the directory you have placed Cmder -3. Execute `.\cmder.exe /REGISTER ALL` +3. Execute `.\cmder.exe /REGISTER ALL` _If you get a message "Access Denied" ensure you are executing the command in an **Administrator** prompt._ In a file explorer window right click in or on a directory to see "Cmder Here" in the context menu. @@ -73,6 +73,12 @@ If you want to run SSH agent on startup, uncomment the line in `/vendor/init.bat 1. Git Bash 2. Check for clink and git before injecting them (Sort of done) +## Current development branch + +You can download builds of the current development branch by going to Appveyor via the following link: + +[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?svg=True)](https://ci.appveyor.com/project/MartiUK/cmder/branch/development/artifacts) + ## License All software included is bundled with own license From c904676cf4afdbe856d6dabee39427be868598cc Mon Sep 17 00:00:00 2001 From: Jan Schulz Date: Wed, 2 Mar 2016 18:29:34 +0100 Subject: [PATCH 2/6] Revert "Set CMDER_START to homeprofile" This reverts commit 728e83a85bea6ad7b4ddda0b960c443e3ef9f737. The problem with *always* setting CMDER_START is that this makes the `-new_console:d:%USERPROFILE%` in the conemu task definitions unnecessary, as this is now always overwritten as CMDER_START is set. This also means that a very visible conemu UI for setting the startup dir does not work anymore which might leave the user puzzled why. --- launcher/src/CmderLauncher.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 4982fd0..b2b0ffa 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -3,7 +3,6 @@ #include #include "resource.h" #include -#include #pragma comment(lib, "Shlwapi.lib") @@ -156,16 +155,7 @@ void StartCmder(std::wstring path, bool is_single_mode) } SetEnvironmentVariable(L"CMDER_ROOT", exeDir); - if (streqi(path.c_str(), L"")) - { - wchar_t* homeProfile = 0; - SHGetKnownFolderPath(FOLDERID_Profile, 0, NULL, &homeProfile); - if (!SetEnvironmentVariable(L"CMDER_START", homeProfile)) { - MessageBox(NULL, _T("Error trying to set CMDER_START to given path!"), _T("Error"), MB_OK); - } - CoTaskMemFree(static_cast(homeProfile)); - } - else + if (!streqi(path.c_str(), L"")) { if (!SetEnvironmentVariable(L"CMDER_START", path.c_str())) { MessageBox(NULL, _T("Error trying to set CMDER_START to given path!"), _T("Error"), MB_OK); From 01667a5bf0c675b94184956c7a0c86754418f96a Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 7 Mar 2016 08:12:50 -0600 Subject: [PATCH 3/6] Process profile.d scripts before adding user aliases --- vendor/init.bat | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index 1409b9f..4fc232c 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -61,6 +61,18 @@ if defined GIT_INSTALL_ROOT ( :: Enhance Path set "PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\" +:: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d" +:: to run them at startup. +if not exist "%CMDER_ROOT%\config\profile.d" ( + mkdir "%CMDER_ROOT%\config\profile.d" +) + +pushd "%CMDER_ROOT%\config\profile.d" +for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do ( + REM echo Calling %CMDER_ROOT%\config\profile.d\%%x... + call "%CMDER_ROOT%\config\profile.d\%%x" +) +popd :: make sure we have an example file if not exist "%CMDER_ROOT%\config\aliases" ( @@ -90,20 +102,6 @@ if defined CMDER_START ( cd /d "%CMDER_START%" ) -:: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d" -:: to run them at startup. -if not exist "%CMDER_ROOT%\config\profile.d" ( - mkdir "%CMDER_ROOT%\config\profile.d" -) - -pushd "%CMDER_ROOT%\config\profile.d" -for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do ( - REM echo Calling %CMDER_ROOT%\config\profile.d\%%x... - call "%CMDER_ROOT%\config\profile.d\%%x" -) -popd - - if exist "%CMDER_ROOT%\config\user-profile.cmd" ( rem create this file and place your own command in there call "%CMDER_ROOT%\config\user-profile.cmd" From 05c113efeece89136ca2b95dd9ae514bc49b19b5 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Thu, 10 Mar 2016 10:50:37 +0000 Subject: [PATCH 4/6] Fix PSReadline clearing directory prompt. If user has PSReadline and is using it be sure to clear 1 less line to prevent the directory prompt from being cleared. Fixes #879 --- vendor/profile.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index cbe7e19..0d830f5 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -88,6 +88,10 @@ if ( $ENV:CMDER_START ) { Set-Location -Path "$ENV:CMDER_START" } +if (Get-Module PSReadline -ErrorAction "SilentlyContinue") { + Set-PSReadlineOption -ExtraPromptLineCount 1 +} + # Enhance Path $env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT" From 0de643be4260259ef451aa3677b8d9def8e003a2 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 17 Mar 2016 03:32:51 +0100 Subject: [PATCH 5/6] :arrow_up: Git@2.7.2.windows.1 Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.3.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 5bf8691..ca0dd64 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.7.2.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/PortableGit-2.7.2-32-bit.7z.exe" + "version": "v2.7.3.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.7.3.windows.1/PortableGit-2.7.3-32-bit.7z.exe" }, { "name": "clink", From 3ca847fc424549947e2f926a3a0d5f35d0470a53 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Fri, 18 Mar 2016 18:20:06 +0100 Subject: [PATCH 6/6] :arrow_up: Git@2.7.4.windows.1 Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.4.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index ca0dd64..3a63b22 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.7.3.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.7.3.windows.1/PortableGit-2.7.3-32-bit.7z.exe" + "version": "v2.7.4.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.7.4.windows.1/PortableGit-2.7.4-32-bit.7z.exe" }, { "name": "clink",