From b018f2cc5053a36f818fea2a13326ea27c9041ca Mon Sep 17 00:00:00 2001 From: Alec Wenzowski Date: Wed, 11 Nov 2015 23:28:04 -0500 Subject: [PATCH 1/5] add bundled vim to path --- vendor/profile.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index cc3850c..320d1c5 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -16,6 +16,12 @@ if( -not $env:PSModulePath.Contains($CmderModulePath) ){ $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;") } +try { + Get-command -Name "vim" -ErrorAction Stop >$null +} catch { + $env:Path += ";$env:CMDER_ROOT\vendor\msysgit\share\vim\vim74" +} + try { # Check if git is on PATH, i.e. Git already installed on system Get-command -Name "git" -ErrorAction Stop >$null @@ -78,4 +84,4 @@ if(Test-Path $CmderUserProfilePath) { } else { Write-Host "Creating user startup file: $CmderUserProfilePath" "# Use this file to run your own startup commands" | Out-File $CmderUserProfilePath -} \ No newline at end of file +} From 37626e7687ee4a8253ee8490e1f7d4140db014f2 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 12 Nov 2015 13:25:49 +0100 Subject: [PATCH 2/5] :arrow_up: ConEmu@151109 Changelog: http://conemu.github.io/blog/2015/11/09/Build-151109.html We skipped http://conemu.github.io/blog/2015/11/01/Build-151101.html for no reason btw. --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 69f9ab6..794db0c 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -11,8 +11,8 @@ }, { "name": "conemu-maximus5", - "version": "151025", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.10.25/ConEmuPack.151025.7z" + "version": "151109", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.11.09/ConEmuPack.151109.7z" }, { "name": "clink-completions", From 3a2d986c361c990861cb5052ba4845dd9c92120b Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 12 Nov 2015 13:28:34 +0100 Subject: [PATCH 3/5] :arrow_up: Git@v2.6.3.windows.1 Changelog: https://github.com/git-for-windows/git/releases/tag/v2.6.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 794db0c..c0e6cb6 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.6.2.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.6.2.windows.1/PortableGit-2.6.2-32-bit.7z.exe" + "version": "v2.6.3.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.6.3.windows.1/PortableGit-2.6.3-32-bit.7z.exe" }, { "name": "clink", From 87bc4178e6df829db8f1e633cba8d5d6d273a534 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 12 Nov 2015 15:18:21 +0100 Subject: [PATCH 4/5] fix vim path in powershell profile --- vendor/profile.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 320d1c5..1383487 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -19,7 +19,7 @@ if( -not $env:PSModulePath.Contains($CmderModulePath) ){ try { Get-command -Name "vim" -ErrorAction Stop >$null } catch { - $env:Path += ";$env:CMDER_ROOT\vendor\msysgit\share\vim\vim74" + $env:Path += ";$env:CMDER_ROOT\vendor\git-for-windows\usr\share\vim\vim74" } try { From eb5ab515739a4a3565beab4708321407a9765ec5 Mon Sep 17 00:00:00 2001 From: Dax Games Date: Sat, 7 Nov 2015 18:12:54 -0600 Subject: [PATCH 5/5] Removed training '\' from %CMDER_ROOT% and added config/user-* to .gitignore --- .gitignore | 1 + Cmder.bat | 1 + vendor/init.bat | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 03da90b..0e9e5ec 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ Thumbs.db build/ Version v* *.bak +config/user-* diff --git a/Cmder.bat b/Cmder.bat index 4ae276a..1f31b73 100644 --- a/Cmder.bat +++ b/Cmder.bat @@ -1,3 +1,4 @@ @echo off SET CMDER_ROOT=%~dp0 +if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml" diff --git a/vendor/init.bat b/vendor/init.bat index 0814411..b25b825 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -9,6 +9,8 @@ for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi ) +@if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% + :: Change the prompt style :: Mmm tasty lamb @prompt $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m @@ -34,7 +36,7 @@ set "GIT_INSTALL_ROOT=%ProgramFiles%\Git" ) else if exist "%ProgramFiles(x86)%\Git" ( set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git" -) else if exist "%CMDER_ROOT%\vendor" ( +) else if exist "%CMDER_ROOT%\vendor\git-for-windows" ( set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows" ) @@ -46,7 +48,7 @@ ) :: Enhance Path -@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT% +@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\ :: Add aliases @doskey /macrofile="%CMDER_ROOT%\config\aliases" @@ -57,7 +59,7 @@ @if defined CMDER_START ( @cd /d "%CMDER_START%" ) else ( - @if "%CD%\" == "%CMDER_ROOT%" ( + @if "%CD%\" == "%CMDER_ROOT%\" ( @cd /d "%HOME%" ) )