From 0311e129ca84fb1eee5e454f3ec9f8229e3c9c07 Mon Sep 17 00:00:00 2001 From: Mike Date: Sun, 22 Feb 2015 23:48:33 -0600 Subject: [PATCH 01/57] Handle quoted paths I was annoyed at having to use short paths all the time in my aliases. It wasn't until I found a command that actually refused to work with a shortpath (running iisexpress.exe) I was determined to find a solution. It appears that the reason the quoted paths weren't working was due to the ::validate alias stuff. The for command would stumble on a quoted path, arguing that /foo was unexpected... The additions on lines 7-8 wrap the input in quotes and then strip the inner quotes. This variable is used in the for loop (instead of %*) for validating the alias. So long as the alias is valid (contains no spaces) then the existing method of appending the new alias to the aliases file works just fine because it still uses %*. --- bin/alias.bat | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/alias.bat b/bin/alias.bat index 1dcfdc5..140a9b2 100644 --- a/bin/alias.bat +++ b/bin/alias.bat @@ -1,27 +1,31 @@ @echo off set ALIASES=%CMDER_ROOT%\config\aliases +setlocal +:: handle quotes within command definition, e.g. quoted long file names +set _x="%*" +set _x=%_x:"=% -if ["%*"] == [""] echo Use /? for help & echo. & goto :p_show +:: check command usage +if ["%_x%"] == [""] echo Use /? for help & echo. & goto :p_show if ["%1"] == ["/?"] goto:p_help if ["%1"] == ["/reload"] goto:p_reload :: /d flag for delete existing alias if ["%1"] == ["/d"] goto:p_del %* if ["%2"] == [""] echo Insufficient parameters. & goto:p_help -::validate alias -setlocal -for /f "delims== tokens=1" %%G in ("%*") do set _temp2=%%G - set _temp=%_temp2: =% +:: validate alias +for /f "delims== tokens=1" %%G in ("%_x%") do set alias=%%G +set _temp=%alias: =% -if not ["%_temp%"] == ["%_temp2%"] ( +if not ["%_temp%"] == ["%alias%"] ( echo Your alias name can not contain a space endlocal goto:eof ) :: replace already defined alias -findstr /b /v /i "%_temp%=" "%ALIASES%" >> "%ALIASES%.tmp" +findstr /b /v /i "%alias%=" "%ALIASES%" >> "%ALIASES%.tmp" echo %* >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp" doskey /macrofile="%ALIASES%" endlocal From 676297c0d438d4bbf2046213971eb70f00ec6652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Szyma=C5=84ski?= Date: Fri, 31 Jul 2015 21:45:32 +0200 Subject: [PATCH 02/57] Fixed: 'Enable-GitColors is Obsolete...' warning --- vendor/profile.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index fcaa56e..b8557db 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -40,7 +40,6 @@ function global:prompt { # Load special features come from posh-git if ($gitStatus) { - Enable-GitColors Start-SshAgent -Quiet } From 316a42b8f932142cfa1687ea635ddf5315e5e05a Mon Sep 17 00:00:00 2001 From: Boris Zhou Date: Mon, 3 Aug 2015 16:06:41 +0200 Subject: [PATCH 03/57] Enhance Path in profile.ps1 --- vendor/profile.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index dad67b7..3bef8b7 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -60,3 +60,6 @@ if (Test-Path Env:\CMDER_START) { } elseif ($Env:CMDER_ROOT -and $Env:CMDER_ROOT.StartsWith($pwd)) { Set-Location -Path $Env:USERPROFILE } + +# Enhance Path +$env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT" \ No newline at end of file From ecbf7a01d1ecfb2e23747e64c037d4fdc549ef16 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Sun, 9 Aug 2015 14:09:30 +0200 Subject: [PATCH 04/57] Revert "Run PowerShell as default" This reverts commit aaf70a4d9fe8b23797e0fdbeb81c1ebe0405e1da. --- config/ConEmu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ConEmu.xml b/config/ConEmu.xml index 5786fba..a6a7bdb 100644 --- a/config/ConEmu.xml +++ b/config/ConEmu.xml @@ -72,7 +72,7 @@ - + From 3e06fcbf074721235c2d9fb2a99ca48a73b6c873 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Sun, 23 Aug 2015 20:09:06 +0200 Subject: [PATCH 05/57] First step at converting msysgit support to git-for-windows support. --- README.md | 2 +- config/ConEmu.xml | 4 ++-- scripts/pack.ps1 | 2 +- vendor/init.bat | 4 ++-- vendor/profile.ps1 | 2 +- vendor/sources.json | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 81ecad7..8146437 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The main advantage of Cmder is portability. It is designed to be totally self-co ## Integration -So you've experimented with cmder a little and want to give it a shot in a more permanent home; +So you've experimented with Cmder a little and want to give it a shot in a more permanent home; ### Shortcut to open Cmder in a chosen folder diff --git a/config/ConEmu.xml b/config/ConEmu.xml index 5786fba..1277d86 100644 --- a/config/ConEmu.xml +++ b/config/ConEmu.xml @@ -516,8 +516,8 @@ - - + + diff --git a/scripts/pack.ps1 b/scripts/pack.ps1 index 178d3a8..f047d82 100644 --- a/scripts/pack.ps1 +++ b/scripts/pack.ps1 @@ -42,7 +42,7 @@ Ensure-Executable "7z" $targets = @{ "cmder.zip" = $null; "cmder.7z" = $null; - "cmder_mini.zip" = "-x!`"vendor\msysgit`""; + "cmder_mini.zip" = "-x!`"vendor\git-for-windows`""; } Delete-Existing "..\Version*" diff --git a/vendor/init.bat b/vendor/init.bat index 7a7f02c..769a654 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -21,7 +21,7 @@ :: Run clink @"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" -:: Prepare for msysgit +:: Prepare for git-for-windows :: I do not even know, copypasted from their .bat @set PLINK_PROTOCOL=ssh @@ -33,7 +33,7 @@ ) else if exist "%ProgramFiles(x86)%\Git" ( set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git" ) else if exist "%CMDER_ROOT%\vendor" ( - set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\msysgit" + set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows" ) :: Add git to the path diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index dad67b7..c460e47 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -14,7 +14,7 @@ try { # Check if git is on PATH, i.e. Git already installed on system Get-command -Name "git" -ErrorAction Stop >$null } catch { - $env:Path += ";$env:CMDER_ROOT\vendor\msysgit\bin" + $env:Path += ";$env:CMDER_ROOT\vendor\git-for-windows\bin" } try { diff --git a/vendor/sources.json b/vendor/sources.json index d15c225..6eca667 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { - "name": "msysgit", - "version": "1.9.5-preview20150319", - "url": "https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/PortableGit-1.9.5-preview20150319.7z" + "name": "git-for-windows", + "version": "v2.5.0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-32-bit.7z.exe" }, { "name": "clink", From 373a58e1e6676c8262702ecea58cb777a3d21adb Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Sun, 23 Aug 2015 20:21:45 +0200 Subject: [PATCH 06/57] forgot one --- scripts/build.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index cca62df..d97a50a 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -11,11 +11,11 @@ .EXAMPLE .\build.ps1 - Executes the default build for cmder; Conemu, clink. This is equivalent to the "minimum" style package in the releases + Executes the default build for Cmder; Conemu, clink. This is equivalent to the "minimum" style package in the releases .EXAMPLE .\build.ps1 -Full - Executes a full build for cmder, including git. This is equivalent to the "full" style package in the releases + Executes a full build for Cmder, including git. This is equivalent to the "full" style package in the releases .EXAMPLE .\build -verbose @@ -62,7 +62,7 @@ Ensure-Executable "7z" New-Item -Type Directory -Path (Join-Path $saveTo "/tmp/") -ErrorAction SilentlyContinue >$null foreach ($s in $sources) { - if($Full -eq $false -and $s.name -eq "msysgit"){ + if($Full -eq $false -and $s.name -eq "git-for-windows"){ Continue } From fc85915b2c7b879daa371567467ef4921b22bbf6 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Fri, 28 Aug 2015 02:47:02 +0200 Subject: [PATCH 07/57] git 2.5 packages the unix commands in `/usr/bin` instead of `/bin`so add that to the path, too. --- vendor/init.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/init.bat b/vendor/init.bat index 769a654..7ede112 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -38,7 +38,7 @@ :: Add git to the path @if defined GIT_INSTALL_ROOT ( - set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\share\vim\vim74;%PATH%" + set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\share\vim\vim74;%PATH%" :: define SVN_SSH so we can use git svn with ssh svn repositories if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe" ) From 5ce077a74af83c2308d53422c56c842484c25ef1 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Fri, 28 Aug 2015 02:53:49 +0200 Subject: [PATCH 08/57] call git's own ssh-agent script instead of our own --- vendor/init.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/init.bat b/vendor/init.bat index 7ede112..a7260ca 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -60,4 +60,4 @@ ) ) -:: @call "%CMDER_ROOT%/bin/agent.cmd" +:: @call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd" From 7fd43b939b17e04b33f4d2f8adf7c3aacc522300 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Mon, 31 Aug 2015 04:40:10 +0200 Subject: [PATCH 09/57] delete our own, now obsolete agent launcher --- bin/agent.cmd | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 bin/agent.cmd diff --git a/bin/agent.cmd b/bin/agent.cmd deleted file mode 100644 index 4eaa614..0000000 --- a/bin/agent.cmd +++ /dev/null @@ -1,46 +0,0 @@ -@ECHO OFF - -REM Set default sock file -SET SSH_AUTH_SOCK=/tmp/ssh-agent.sock - -REM Check socket is available -IF NOT EXIST "%TMP%\ssh-agent.sock" GOTO:RUNAGENT - -REM Check if an ssh-agent is running -FOR /f "tokens=*" %%I IN ('ps ^| grep ssh-agent ^| sed "s/^ *\([0-9]\+\) .*/\1/"') DO SET VAR=%%I -IF "%VAR%" == "" GOTO:RUNAGENT - -REM Check if socket file is valid -ssh-add -l 1> NUL 2>&1 -IF ERRORLEVEL 1 GOTO:RUNAGENT -GOTO:ADDKEYS - -:RUNAGENT -REM Remove old socket file -rm -f /tmp/ssh-agent.sock - -REM Run ssh-agent and save (last) PID in VAR -SET VAR= -FOR /f "tokens=*" %%J IN ('ssh-agent -a /tmp/ssh-agent.sock') DO FOR /f "tokens=*" %%K IN ('echo %%J ^| grep "SSH_AGENT_PID" ^| sed "s/^SSH_AGENT_PID=\([0-9]\+\); .*/\1/"') DO SET VAR=%%K - -:ADDKEYS -SET SSH_AUTH_PID=%VAR% - -REM Check if ssh keys are known -SET KEYS= -FOR /f "tokens=*" %%I IN ('DIR /B "%HOME%\.ssh\*_rsa"') DO CALL:CHECKKEY %%I - -REM Add missing ssh keys at once -IF NOT "%KEYS%" == "" ssh-add %KEYS% -GOTO:END - -REM Functions -REM Check if ssh key has to be added -:CHECKKEY -SET VAR= -FOR /f "tokens=*" %%J IN ('ssh-add -l ^| grep "%1"') DO SET VAR=%%J -IF "%VAR%" == "" SET KEYS='%HOME%\.ssh\%1' %KEYS% -GOTO:EOF - -:END -@ECHO ON From 143e659187e32da8c86f766645c3cdd28819804a Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Mon, 31 Aug 2015 04:48:46 +0200 Subject: [PATCH 10/57] :arrow_up: clink to 0.4.5 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index d15c225..f98fb79 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,8 +6,8 @@ }, { "name": "clink", - "version": "0.4.4", - "url": "https://github.com/mridgers/clink/releases/download/0.4.4/clink_0.4.4.zip" + "version": "0.4.5", + "url": "https://github.com/mridgers/clink/releases/download/0.4.5/clink_0.4.5.zip" }, { "name": "conemu-maximus5", From 801a4ac901d534c4f56e275a3ed59819ceba400b Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Mon, 31 Aug 2015 05:05:16 +0200 Subject: [PATCH 11/57] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8146437..63094aa 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,9 @@ All aliases will be saved in `/config/aliases` file ### SSH Agent -To start SSH agent simply call `agent`, which is in the `bin` folder. +To start SSH agent simply call `agent`, which is in the `vendor/git-for-windows/cmd` folder. -If you want to run SSH agent on startup, uncomment the line in `/vendor/init.bat`so it says `@call "%CMDER_ROOT%/bin/agent.cmd"`. +If you want to run SSH agent on startup, uncomment the line in `/vendor/init.bat`so it says `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"`. ## Todo From 7c907a517433c9869d72708de4853017536a923a Mon Sep 17 00:00:00 2001 From: Maximus5 Date: Wed, 19 Aug 2015 02:13:22 +0300 Subject: [PATCH 12/57] Use standard path for ConEmu.xml --- launcher/src/CmderLauncher.cpp | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 893e33c..49f836a 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -79,6 +79,19 @@ optpair GetOption() return pair; } +bool FileExists(const wchar_t * filePath) +{ + HANDLE hFile = CreateFile(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + return true; + } + + return false; +} + void StartCmder(std::wstring path, bool is_single_mode) { #if USE_TASKBAR_API @@ -87,6 +100,7 @@ void StartCmder(std::wstring path, bool is_single_mode) wchar_t exeDir[MAX_PATH] = { 0 }; wchar_t icoPath[MAX_PATH] = { 0 }; wchar_t cfgPath[MAX_PATH] = { 0 }; + wchar_t oldCfgPath[MAX_PATH] = { 0 }; wchar_t conEmuPath[MAX_PATH] = { 0 }; wchar_t args[MAX_PATH * 2 + 256] = { 0 }; @@ -99,16 +113,29 @@ void StartCmder(std::wstring path, bool is_single_mode) PathRemoveFileSpec(exeDir); PathCombine(icoPath, exeDir, L"icons\\cmder.ico"); - PathCombine(cfgPath, exeDir, L"config\\ConEmu.xml"); + PathCombine(oldCfgPath, exeDir, L"config\\ConEmu.xml"); + PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml"); PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe"); + if (FileExists(oldCfgPath) && !FileExists(cfgPath)) + { + if (!CopyFile(oldCfgPath, cfgPath, FALSE)) + { + MessageBox(NULL, + (GetLastError() == ERROR_ACCESS_DENIED) + ? L"Failed to copy ConEmu.xml file to new location! Restart cmder as administrator." + : L"Failed to copy ConEmu.xml file to new location!", MB_TITLE, MB_ICONSTOP); + exit(1); + } + } + if (is_single_mode) { - swprintf_s(args, L"/single /Icon \"%s\" /Title Cmder /LoadCfgFile \"%s\"", icoPath, cfgPath); + swprintf_s(args, L"/single /Icon \"%s\" /Title Cmder", icoPath); } else { - swprintf_s(args, L"/Icon \"%s\" /Title Cmder /LoadCfgFile \"%s\"", icoPath, cfgPath); + swprintf_s(args, L"/Icon \"%s\" /Title Cmder", icoPath); } SetEnvironmentVariable(L"CMDER_ROOT", exeDir); From eec3fd5578795e87b5e9a90f5e2bf4d021be71ef Mon Sep 17 00:00:00 2001 From: Maximus5 Date: Tue, 1 Sep 2015 20:05:57 +0300 Subject: [PATCH 13/57] Backup and restore ConEmu.xml on ./build.ps1 --- scripts/build.ps1 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index cca62df..e1b2508 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -47,7 +47,10 @@ Param( [string]$launcher = "..\launcher", # Include git with the package build - [switch]$Full + [switch]$Full, + + # config folder location + [string]$config = "..\config" ) . "$PSScriptRoot\utils.ps1" @@ -61,6 +64,16 @@ Ensure-Exists $sourcesPath Ensure-Executable "7z" New-Item -Type Directory -Path (Join-Path $saveTo "/tmp/") -ErrorAction SilentlyContinue >$null +# Preserve modified (by user) ConEmu setting file +if ($config -ne "") { + $ConEmuXml = Join-Path $saveTo "conemu-maximus5\ConEmu.xml" + if (Test-Path $ConEmuXml -pathType leaf) { + $ConEmuXmlSave = Join-Path $config "ConEmu.xml" + Write-Verbose "Backup '$ConEmuXml' to '$ConEmuXmlSave'" + Copy-Item $ConEmuXml $ConEmuXmlSave + } else { $ConEmuXml = "" } +} else { $ConEmuXml = "" } + foreach ($s in $sources) { if($Full -eq $false -and $s.name -eq "msysgit"){ Continue @@ -83,6 +96,12 @@ foreach ($s in $sources) { "$($s.version)" | Out-File "$($s.name)/.cmderver" } +# Restore user configuration +if ($ConEmuXml -ne "") { + Write-Verbose "Restore '$ConEmuXmlSave' to '$ConEmuXml'" + Copy-Item $ConEmuXmlSave $ConEmuXml +} + Pop-Location Push-Location -Path $launcher From 6952d602d2595a3296d5891951cbebaefaafbc76 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 2 Sep 2015 19:50:44 +0200 Subject: [PATCH 14/57] update to 2.5.1 https://github.com/git-for-windows/git/releases/tag/v2.5.1.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 6eca667..c16c89a 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.5.0.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-32-bit.7z.exe" + "version": "v2.5.1.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.1.windows.1/PortableGit-2.5.1-32-bit.7z.exe" }, { "name": "clink", From f783cd8addd1d86d43153e077628c8b07743eec2 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Sat, 5 Sep 2015 00:04:51 +0200 Subject: [PATCH 15/57] fix readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63094aa..0199493 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ All aliases will be saved in `/config/aliases` file ### SSH Agent -To start SSH agent simply call `agent`, which is in the `vendor/git-for-windows/cmd` folder. +To start SSH agent simply call `start-ssh-agent`, which is in the `vendor/git-for-windows/cmd` folder. If you want to run SSH agent on startup, uncomment the line in `/vendor/init.bat`so it says `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"`. From 583109b6955201b7f3e232e00c284b12556b2690 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Fri, 11 Sep 2015 22:53:21 +0200 Subject: [PATCH 16/57] update to 2.5.2 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index c16c89a..621aaae 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.5.1.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.5.1.windows.1/PortableGit-2.5.1-32-bit.7z.exe" + "version": "v2.5.2.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.2.windows.1/PortableGit-2.5.2-32-bit.7z.exe" }, { "name": "clink", From 4ed35fe1108c0f0565c44409b0f2ad042c2a3f6a Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Fri, 11 Sep 2015 23:51:10 +0200 Subject: [PATCH 17/57] Revert 8b8f98c Breaks Git: #503 #521, because git actually uses git-. --- scripts/pack.ps1 | 1 - scripts/utils.ps1 | 5 ----- 2 files changed, 6 deletions(-) diff --git a/scripts/pack.ps1 b/scripts/pack.ps1 index 178d3a8..45a462e 100644 --- a/scripts/pack.ps1 +++ b/scripts/pack.ps1 @@ -46,7 +46,6 @@ $targets = @{ } Delete-Existing "..\Version*" -Cleanup-Git $version = Invoke-Expression "git describe --abbrev=0 --tags" (New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null diff --git a/scripts/utils.ps1 b/scripts/utils.ps1 index 68e1286..3154db1 100644 --- a/scripts/utils.ps1 +++ b/scripts/utils.ps1 @@ -61,11 +61,6 @@ function Digest-MD5 ($path) { return Invoke-Expression "md5sum $path" } -function Cleanup-Git () { - $gitdir = '../vendor/msysgit/libexec/git-core/' - Get-Childitem $gitdir -Exclude git.exe | Where-Object{!($_.PSIsContainer)} | Foreach-Object { Remove-Item $_.FullName } -} - function Register-Cmder(){ [CmdletBinding()] Param From 4edec1675a9465deb4f042377c4260c4c9980d53 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 16 Sep 2015 06:18:29 +0200 Subject: [PATCH 18/57] update to 2.5.2 release 2 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 621aaae..8afad54 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.5.2.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.5.2.windows.1/PortableGit-2.5.2-32-bit.7z.exe" + "version": "v2.5.2.windows.2", + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.2.windows.2/PortableGit-2.5.2.2-32-bit.7z.exe" }, { "name": "clink", From b40b0067c006d75b521d57645132664d41872684 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 23 Sep 2015 20:51:53 +0200 Subject: [PATCH 19/57] :arrow_up: Git to v2.5.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 8afad54..78d36ff 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.5.2.windows.2", - "url": "https://github.com/git-for-windows/git/releases/download/v2.5.2.windows.2/PortableGit-2.5.2.2-32-bit.7z.exe" + "version": "v2.5.3.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.3.windows.1/PortableGit-2.5.3-32-bit.7z.exe" }, { "name": "clink", From 32cd7dcb585aa187b4264d9ee3a797f5a6b4ce52 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 30 Sep 2015 20:35:13 +0200 Subject: [PATCH 20/57] :arrow_up: Git to v2.6.0.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 78d36ff..cc372d3 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.5.3.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.5.3.windows.1/PortableGit-2.5.3-32-bit.7z.exe" + "version": "v2.6.0.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.6.0.windows.1/PortableGit-2.6.0-32-bit.7z.exe" }, { "name": "clink", From 73c8c0c233e5a93ffa26c95b277013c7c83ef813 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Tue, 6 Oct 2015 21:45:32 +0300 Subject: [PATCH 21/57] Upgrade clink-completions --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index f98fb79..f79d500 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -16,7 +16,7 @@ }, { "name": "clink-completions", - "version": "0.1.0", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.1.0.zip" + "version": "0.2.0", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.2.0.zip" } ] From 36291ab789172be3d58af0880be16c5bfcaee12d Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Tue, 6 Oct 2015 21:16:32 +0200 Subject: [PATCH 22/57] :arrow_up: Git for Windows to v2.6.1.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index cc372d3..93f949d 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.6.0.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.6.0.windows.1/PortableGit-2.6.0-32-bit.7z.exe" + "version": "v2.6.1.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.6.1.windows.1/PortableGit-2.6.1-32-bit.7z.exe" }, { "name": "clink", From 7bc71010c2de7a6641662d44d224815170d59121 Mon Sep 17 00:00:00 2001 From: Thomas Chacko Date: Thu, 9 Jul 2015 11:42:53 +0530 Subject: [PATCH 23/57] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cd19a9f..03da90b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Thumbs.db *.dll build/ Version v* +*.bak From 20b8b0941901b1c50cbc891acba0c73eee418848 Mon Sep 17 00:00:00 2001 From: Malobre Date: Wed, 1 Jul 2015 12:55:20 +0200 Subject: [PATCH 24/57] Add `-ExecutionPolicy Bypass` to the powershell tasks Fix issue #483 --- config/ConEmu.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ConEmu.xml b/config/ConEmu.xml index 5786fba..3d03021 100644 --- a/config/ConEmu.xml +++ b/config/ConEmu.xml @@ -497,7 +497,7 @@ - + @@ -507,7 +507,7 @@ - + From df259195ab15f78e657f2b13b8eb0df7fca81c06 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 19 Aug 2015 03:18:53 +0200 Subject: [PATCH 25/57] :arrow_up: ConEmu@150816 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index f98fb79..bbfa956 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -11,8 +11,8 @@ }, { "name": "conemu-maximus5", - "version": "150513", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.05.13/ConEmuPack.150513.7z" + "version": "150816", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.08.16/ConEmuPack.150816.7z" }, { "name": "clink-completions", From 24fd027cda34edb08f24ddebddf578924486a3be Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 24 Sep 2015 02:17:54 +0200 Subject: [PATCH 26/57] Update ConEmo project URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81ecad7..ff91337 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Latest release is **[v1.2](https://github.com/bliker/cmder/releases/tag/v1.2)** -Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://code.google.com/p/conemu-maximus5/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout. +Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout. ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png) From 83c685cdc7f60a01f1d55098b5e096d5d60f25b7 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 24 Sep 2015 02:19:54 +0200 Subject: [PATCH 27/57] :arrow_up: ConEmu to v15.09.13 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index bbfa956..a5835c6 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -11,8 +11,8 @@ }, { "name": "conemu-maximus5", - "version": "150816", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.08.16/ConEmuPack.150816.7z" + "version": "150913", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.09.13/ConEmuPack.150913.7z" }, { "name": "clink-completions", From cec7fa339886d3149228b301c80cdc910a9765ac Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 24 Sep 2015 16:22:41 +0200 Subject: [PATCH 28/57] Merge https://github.com/cmderdev/cmder/commit/eec3fd5578795e87b5e9a90f5e2bf4d021be71ef --- scripts/build.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index e1b2508..585d3fd 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -46,11 +46,11 @@ Param( # Launcher folder location [string]$launcher = "..\launcher", - # Include git with the package build - [switch]$Full, + # Config folder location + [string]$config = "..\config", - # config folder location - [string]$config = "..\config" + # Include git with the package build + [switch]$Full ) . "$PSScriptRoot\utils.ps1" @@ -74,6 +74,7 @@ if ($config -ne "") { } else { $ConEmuXml = "" } } else { $ConEmuXml = "" } + foreach ($s in $sources) { if($Full -eq $false -and $s.name -eq "msysgit"){ Continue From d68816bd116d26ff260e48b7f2999a9befb8598d Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Mon, 12 Oct 2015 13:29:47 +0200 Subject: [PATCH 29/57] Update readme --- README.md | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 5067ddf..d0ef99f 100644 --- a/README.md +++ b/README.md @@ -2,24 +2,20 @@ [![Join the chat at https://gitter.im/bliker/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bliker/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -Latest release is **[v1.2](https://github.com/bliker/cmder/releases/tag/v1.2)** - -Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout. +Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, adds a Monokai color scheme, integrates amazing [clink](https://github.com/mridgers/clink) and a custom prompt layout. ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png) ## Why use it -The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, that is makes it great for **USB Sticks** or **Dropbox**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere. +The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, that is makes it great for **USB Sticks** or **cloud storage**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere. ## Installation -1. Download the latest release +1. Download the [latest release](https://github.com/cmderdev/cmder/releases/) 2. Extract 3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH. -4. Run cmder - -*(There will be a version with installer)* +4. Run Cmder ## Integration @@ -38,18 +34,18 @@ In a file explorer window right click in or on a directory to see "Cmder Here" i ### Tab manipulation -* `Ctrl + t` : new tab dialog (maybe you want to open cmd as admin?) -* `Ctrl + w` : close tab -* `Ctrl + d` : close tab (if pressed on empty command) -* `Shift + alt + number` : fast new tab: `1` - CMD, `2` - Powershell `*` - More to come -* `Alt + enter`: Fullscreen +* Ctrl + T : New tab dialog (maybe you want to open cmd as admin?) +* Ctrl + W : Close tab +* Ctrl + D : Close tab (if pressed on empty command) +* Shift + Alt + #Number : Fast new tab: 1 - CMD, 2 - PowerShell +* Alt + Enter: Fullscreen ### Shell -* `Shift + Up` : Traverse up in directory structure (lovely feature!) -* `End, Home, Ctrl` : Traversing text with as usual on Windows -* `Ctrl + r` : History search -* `Shift + mouse` : Select and copy text from buffer +* Shift + Up : Traverse up in directory structure (lovely feature!) +* End, Home, Ctrl : Traversing text with as usual on Windows +* Ctrl + R : History search +* Shift + Mouse : Select and copy text from buffer (Some shortcuts are not yet documented, thought they exist, please add them here) From 2a26026749beefcab1ab83cdc92346e489338c61 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Mon, 12 Oct 2015 14:30:04 +0200 Subject: [PATCH 30/57] Update README.md Update Gitter badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0ef99f..44a4f11 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cmder -[![Join the chat at https://gitter.im/bliker/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bliker/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/bliker/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, adds a Monokai color scheme, integrates amazing [clink](https://github.com/mridgers/clink) and a custom prompt layout. From 48259b87ac7f08174f3e1cb30340e8e6de758cf7 Mon Sep 17 00:00:00 2001 From: Jan Schulz Date: Tue, 25 Aug 2015 19:44:23 +0200 Subject: [PATCH 31/57] Add a user startup file which can be modified Up to now, init.bat would be overwritten when a user updated Cmder. The new mechanism will create a new (mostly empty) file for the user to enter commands which will then be executed on each following startup. --- README.md | 2 +- vendor/init.bat | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 44a4f11..16c11da 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ All aliases will be saved in `/config/aliases` file To start SSH agent simply call `start-ssh-agent`, which is in the `vendor/git-for-windows/cmd` folder. -If you want to run SSH agent on startup, uncomment the line in `/vendor/init.bat`so it says `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"`. +If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"` in `/config/user-startup.bat` (usually just uncomment it). ## Todo diff --git a/vendor/init.bat b/vendor/init.bat index a7260ca..76483aa 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -2,6 +2,9 @@ :: Sets some nice defaults :: Created as part of cmder project +:: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED +:: !!! Use "%CMDER_ROOT%\config\user-startup.cmd" to add your own startup commands + :: Find root dir @if not defined CMDER_ROOT ( for /f "delims=" %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi @@ -60,4 +63,17 @@ ) ) -:: @call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd" +@if exist "%CMDER_ROOT%\config\user-startup.cmd" ( + @rem create this file and place your own command in there + call "%CMDER_ROOT%\config\user-startup.cmd" +) else ( + @echo Creating user startup file: "%CMDER_ROOT%\config\user-startup.cmd" + ( + @echo :: use this file to run your own startup commands + @echo :: use @ in front of the command to prevent printing the command + @echo. + @echo :: @call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd + @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% + @echo. + ) > "%CMDER_ROOT%\config\user-startup.cmd" +) From 0051614e4b8177ef21c5ff0b3714dc0bfe8b4a34 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 14 Oct 2015 05:13:13 +0200 Subject: [PATCH 32/57] Update packignore --- packignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packignore b/packignore index b459393..b6718ba 100644 --- a/packignore +++ b/packignore @@ -4,6 +4,9 @@ launcher .git *.rb build +scripts config\.history packignore +icons\Thumbs.db +icons\cmder_icon.psd Cmder.bat From b8f7bde353b6cf2a6d78d3cd77d61bfc8e55c6e2 Mon Sep 17 00:00:00 2001 From: Jan Schulz Date: Wed, 14 Oct 2015 12:48:14 +0200 Subject: [PATCH 33/57] Fix init.bat generation --- vendor/init.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/init.bat b/vendor/init.bat index 76483aa..a6b09ca 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -72,7 +72,7 @@ @echo :: use this file to run your own startup commands @echo :: use @ in front of the command to prevent printing the command @echo. - @echo :: @call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd + @echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% @echo. ) > "%CMDER_ROOT%\config\user-startup.cmd" From 27240995f4ce6a45a366223df8047500eeaf0cd7 Mon Sep 17 00:00:00 2001 From: Jackbennett Date: Wed, 14 Oct 2015 12:59:20 +0100 Subject: [PATCH 34/57] Let developers without VS installed test build scripts Developers can test the build process without needing to recompile a new launcher exe. This saves some setup steps to get a new developer started. Also warn that this build can't be release as by definition it can't be fully tested. --- scripts/build.ps1 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 937818d..3700deb 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -50,7 +50,10 @@ Param( [string]$config = "..\config", # Include git with the package build - [switch]$Full + [switch]$Full, + + # New launcher if you have MSBuild tools installed + [switch]$Compile ) . "$PSScriptRoot\utils.ps1" @@ -105,8 +108,13 @@ if ($ConEmuXml -ne "") { Pop-Location -Push-Location -Path $launcher -msbuild CmderLauncher.vcxproj /p:configuration=Release -Pop-Location +if($Compile) { + Push-Location -Path $launcher + msbuild CmderLauncher.vcxproj /p:configuration=Release + Pop-Location +} else { + Write-Warning "You are not building a launcher, Use -Complie" + Write-Warning "This cannot be a release. Test build only!" +} Write-Verbose "All good and done!" From fedcee011dc9927a4719d1dbe30f7fb5c0b717ed Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 14 Oct 2015 15:35:51 +0200 Subject: [PATCH 35/57] fix vim path --- vendor/init.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index a6b09ca..691fb6c 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -41,7 +41,7 @@ :: Add git to the path @if defined GIT_INSTALL_ROOT ( - set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\share\vim\vim74;%PATH%" + set "PATH=%GIT_INSTALL_ROOT%\bin;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\usr\share\vim\vim74;%PATH%" :: define SVN_SSH so we can use git svn with ssh svn repositories if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe" ) @@ -69,11 +69,11 @@ ) else ( @echo Creating user startup file: "%CMDER_ROOT%\config\user-startup.cmd" ( - @echo :: use this file to run your own startup commands + @echo :: use this file to run your own startup commands @echo :: use @ in front of the command to prevent printing the command - @echo. + @echo. @echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% - @echo. + @echo. ) > "%CMDER_ROOT%\config\user-startup.cmd" ) From f71a1f3903da1d774bd4aeeca844a51b101dd0cd Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 14 Oct 2015 15:45:42 +0200 Subject: [PATCH 36/57] Update packignore --- packignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packignore b/packignore index b6718ba..cb6e60b 100644 --- a/packignore +++ b/packignore @@ -9,4 +9,9 @@ config\.history packignore icons\Thumbs.db icons\cmder_icon.psd +icons\icon_16.png +icons\icon_32.png +icons\icon_48.png +icons\icon_256.png Cmder.bat +vendor\tmp From 0ab9b74013b4fa7ee8a0874bb10f05a75cab6eda Mon Sep 17 00:00:00 2001 From: Pireax Date: Wed, 14 Oct 2015 18:50:52 +0200 Subject: [PATCH 37/57] Add user startup file for powershell --- vendor/profile.ps1 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 905b4b7..6c7270a 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -62,4 +62,14 @@ if (Test-Path Env:\CMDER_START) { } # Enhance Path -$env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT" \ No newline at end of file +$env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT" + + +$CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config/user-profile.ps1" +if(Test-Path $CmderUserProfilePath) { + # Create this file and place your own command in there. + Invoke-Expression $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 45cdfc33f27c7f9bed12ff5bc9e31c84296d69b2 Mon Sep 17 00:00:00 2001 From: Jack Bennett Date: Wed, 14 Oct 2015 18:19:08 +0100 Subject: [PATCH 38/57] Remove the -full build switch. Add a compile example. To get the functionality of -Full back just supply your own sources.json with the vendors you wish. Fix a typo and update the project url. --- scripts/build.ps1 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 3700deb..30a02e9 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -13,9 +13,9 @@ Executes the default build for Cmder; Conemu, clink. This is equivalent to the "minimum" style package in the releases .EXAMPLE - .\build.ps1 -Full + .\build.ps1 -Compile - Executes a full build for Cmder, including git. This is equivalent to the "full" style package in the releases + Recompile the launcher executable if you have the requisite build tools for C++ installed. .EXAMPLE .\build -verbose @@ -29,7 +29,7 @@ Samuel Vasko, Jack Bennett Part of the Cmder project. .LINK - https://github.com/bliker/cmder - Project Home + http://cmder.net/ - Project Home #> [CmdletBinding(SupportsShouldProcess=$true)] Param( @@ -49,9 +49,6 @@ Param( # Config folder location [string]$config = "..\config", - # Include git with the package build - [switch]$Full, - # New launcher if you have MSBuild tools installed [switch]$Compile ) @@ -79,10 +76,6 @@ if ($config -ne "") { foreach ($s in $sources) { - if($Full -eq $false -and $s.name -eq "git-for-windows"){ - Continue - } - Write-Verbose "Getting $($s.name) from URL $($s.url)" # We do not care about the extensions/type of archive @@ -113,7 +106,7 @@ if($Compile) { msbuild CmderLauncher.vcxproj /p:configuration=Release Pop-Location } else { - Write-Warning "You are not building a launcher, Use -Complie" + Write-Warning "You are not building a launcher, Use -Compile" Write-Warning "This cannot be a release. Test build only!" } From 5a1aa7e25b9c91e012e999c24132c219228fef41 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 14 Oct 2015 19:50:49 +0200 Subject: [PATCH 39/57] add overwrite notice to posh profile, too --- vendor/init.bat | 1 - vendor/profile.ps1 | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vendor/init.bat b/vendor/init.bat index 691fb6c..0814411 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -1,5 +1,4 @@ :: Init Script for cmd.exe -:: Sets some nice defaults :: Created as part of cmder project :: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 6c7270a..517efea 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -1,3 +1,9 @@ +# Init Script for PowerShell +# Created as part of cmder project + +# !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED +# !!! Use "%CMDER_ROOT%\config\user-profile.ps1" to add your own startup commands + # Compatibility with PS major versions <= 2 if(!$PSScriptRoot) { $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path From 7ebfffc9da6c057485f79ec65d35226b14be0c05 Mon Sep 17 00:00:00 2001 From: Jack Bennett Date: Wed, 14 Oct 2015 19:24:54 +0100 Subject: [PATCH 40/57] Remove incorrect charater at start of line. --- vendor/profile.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 517efea..cc7e753 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -4,7 +4,7 @@ # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED # !!! Use "%CMDER_ROOT%\config\user-profile.ps1" to add your own startup commands -# Compatibility with PS major versions <= 2 +# Compatibility with PS major versions <= 2 if(!$PSScriptRoot) { $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path } From 1e61b858c37e5bdedb926135ee0a7147fa35db57 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Thu, 15 Oct 2015 07:52:05 +0200 Subject: [PATCH 41/57] wipe the build dir clean before packing so leftovers don't end up in the release zips --- scripts/pack.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/pack.ps1 b/scripts/pack.ps1 index 6d9b2bb..a0956c5 100644 --- a/scripts/pack.ps1 +++ b/scripts/pack.ps1 @@ -19,7 +19,7 @@ Samuel Vasko, Jack Bennett, Martin Kemp Part of the Cmder project. .LINK - https://github.com/bliker/cmder - Project Home + https://github.com/cmderdev/cmder - Project Home #> [CmdletBinding(SupportsShouldProcess=$true)] @@ -46,6 +46,7 @@ $targets = @{ } Delete-Existing "..\Version*" +Delete-Existing "..\build\*" $version = Invoke-Expression "git describe --abbrev=0 --tags" (New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null From 07180effac5ce9759d05b986be2ab654c2eebf21 Mon Sep 17 00:00:00 2001 From: Pireax Date: Thu, 15 Oct 2015 11:47:32 +0200 Subject: [PATCH 42/57] Fixed problem with Invoke-Expression --- vendor/profile.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index cc7e753..88abb61 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -74,7 +74,7 @@ $env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT" $CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config/user-profile.ps1" if(Test-Path $CmderUserProfilePath) { # Create this file and place your own command in there. - Invoke-Expression $CmderUserProfilePath + . "$CmderUserProfilePath" } else { Write-Host "Creating user startup file: $CmderUserProfilePath" "# Use this file to run your own startup commands" | Out-File $CmderUserProfilePath From 1d47a983296eb286cd5475e2cb91382eccafb384 Mon Sep 17 00:00:00 2001 From: Pireax Date: Thu, 15 Oct 2015 12:15:19 +0200 Subject: [PATCH 43/57] lambda was encoded with UTF-8 without BOM, didn't show properly --- vendor/profile.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index 88abb61..cc3850c 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -1,4 +1,4 @@ -# Init Script for PowerShell +# Init Script for PowerShell # Created as part of cmder project # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED From 46fed27096c334a33787dff7782ceb418116c91a Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Tue, 13 Oct 2015 09:40:48 +0100 Subject: [PATCH 44/57] Build behind proxy and appveyor. Fixes #79. Uses Download-File function from d654a53ec43038c42344f9cdbe0abc5b8ff9b387 Create appveyor.yml Should send build notifications to gitter as well. Adds appveyor build status badge. Always compile launcher for AppVeyor This is to catch any errors that may be caused by changes to the launcher or any outside scripts. --- README.md | 2 ++ appveyor.yml | 40 ++++++++++++++++++++++++++++++++++++++++ scripts/build.ps1 | 4 ++-- scripts/utils.ps1 | 13 +++++++++++++ 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 appveyor.yml diff --git a/README.md b/README.md index 44a4f11..cbf67e2 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![Join the chat at https://gitter.im/bliker/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +![Build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?retina=true) + Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, adds a Monokai color scheme, integrates amazing [clink](https://github.com/mridgers/clink) and a custom prompt layout. ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png) diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..6afea95 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,40 @@ +#---------------------------------# +# general configuration # +#---------------------------------# + +version: 1.0.{build}-{branch} + +# branches to build +branches: + # blacklist + except: + - gh-pages + +# Do not build on tags +skip_tags: true + +#---------------------------------# +# environment configuration # +#---------------------------------# + +# Operating system (build VM template) +os: Windows Server 2012 R2 + +#---------------------------------# +# build configuration # +#---------------------------------# + +build_script: + - ps: cd scripts; .\build.ps1 -Compile -verbose + +#---------------------------------# +# notifications # +#---------------------------------# + +notifications: + # Webhook + - provider: Webhook + url: https://webhooks.gitter.im/e/f7b9c3ae66741c2e046e + on_build_success: true + on_build_failure: true + on_build_status_changed: true diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 937818d..4eb3625 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -74,7 +74,7 @@ if ($config -ne "") { } else { $ConEmuXml = "" } } else { $ConEmuXml = "" } - +$vend = $pwd foreach ($s in $sources) { if($Full -eq $false -and $s.name -eq "git-for-windows"){ Continue @@ -87,7 +87,7 @@ foreach ($s in $sources) { Delete-Existing $tempArchive Delete-Existing $s.name - Invoke-WebRequest -Uri $s.url -OutFile $tempArchive -ErrorAction Stop + Download-File -Url $s.url -File $vend\$tempArchive -ErrorAction Stop Extract-Archive $tempArchive $s.name if ((Get-Childitem $s.name).Count -eq 1) { diff --git a/scripts/utils.ps1 b/scripts/utils.ps1 index 3154db1..9c5679a 100644 --- a/scripts/utils.ps1 +++ b/scripts/utils.ps1 @@ -89,3 +89,16 @@ function Register-Cmder(){ New-Item -Path "HKCR:\Directory\Shell\Cmder\Command" -Force -Value "`"$PathToExe`" `"$Command`" " } } + +function Download-File { + param ( + $Url, + $File + ) + # I think this is the problem + $File = $File -Replace "/", "\" + Write-Verbose "Downloading from $Url to $File" + $wc = new-object System.Net.WebClient + $wc.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetworkCredentials; + $wc.DownloadFile($Url, $File) +} From 5e07567a724e39c7d827c14d4b2d2a731afb9fba Mon Sep 17 00:00:00 2001 From: Jackbennett Date: Fri, 16 Oct 2015 13:09:58 +0100 Subject: [PATCH 45/57] Pre-set tasks for the 9 number keys Task macros ready for users who want to configure their own extra tasks --- config/ConEmu.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/config/ConEmu.xml b/config/ConEmu.xml index 1b182fc..f675df0 100644 --- a/config/ConEmu.xml +++ b/config/ConEmu.xml @@ -734,27 +734,27 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + From 50c574279458946b9306907830bd844e93f2896a Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 21 Oct 2015 21:21:54 +0200 Subject: [PATCH 46/57] :arrow_up: Git@2.6.2.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 15aafcf..fc912b9 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.6.1.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.6.1.windows.1/PortableGit-2.6.1-32-bit.7z.exe" + "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" }, { "name": "clink", From 15013369cb233b78c39d1f3b37990dd921d715f5 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 21 Oct 2015 21:24:42 +0200 Subject: [PATCH 47/57] :arrow_up: ConEmu@151015 Changelogs: https://conemu.github.io/blog/2015/10/06/Build-151006.html https://conemu.github.io/blog/2015/10/15/Build-151015.html --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index fc912b9..6561fcf 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -11,8 +11,8 @@ }, { "name": "conemu-maximus5", - "version": "150913", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.09.13/ConEmuPack.150913.7z" + "version": "151015", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.10.15/ConEmuPack.151015.7z" }, { "name": "clink-completions", From 66a75ce0dce37f84246dbf6ccfe8a4835e3b051f Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Wed, 21 Oct 2015 23:19:19 +0300 Subject: [PATCH 48/57] :arrow_up: Bump clink-completions to 0.2.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 6561fcf..e2b2c82 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -16,7 +16,7 @@ }, { "name": "clink-completions", - "version": "0.2.0", - "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.2.0.zip" + "version": "0.2.1", + "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.2.1.zip" } ] From 669bc8bfa6160a707a275292ae11b6050d5a7ddc Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Sun, 25 Oct 2015 03:00:37 +0100 Subject: [PATCH 49/57] Update Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 675dc0b..6c3596f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![Build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?retina=true) -Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, adds a Monokai color scheme, integrates amazing [clink](https://github.com/mridgers/clink) and a custom prompt layout. +Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, comes with a Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) (further enhanced by [clink-completions](https://github.com/vladimir-kotikov/clink-completions)) and a custom prompt layout. ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png) From df3798170754a89f996dd5c1af840b65f43a7c6f Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Tue, 27 Oct 2015 07:12:21 +0100 Subject: [PATCH 50/57] :arrow_up: ConEmu@v15.10.25 Changelog: http://conemu.github.io/blog/2015/10/25/Build-151025.html --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index e2b2c82..69f9ab6 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -11,8 +11,8 @@ }, { "name": "conemu-maximus5", - "version": "151015", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.10.15/ConEmuPack.151015.7z" + "version": "151025", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.10.25/ConEmuPack.151025.7z" }, { "name": "clink-completions", From 3657795b35e07c4eccda2715658e66ad300fb0b7 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Tue, 27 Oct 2015 07:24:19 +0100 Subject: [PATCH 51/57] Don't package the appveyor file --- packignore | 1 + 1 file changed, 1 insertion(+) diff --git a/packignore b/packignore index cb6e60b..d72b3ed 100644 --- a/packignore +++ b/packignore @@ -15,3 +15,4 @@ icons\icon_48.png icons\icon_256.png Cmder.bat vendor\tmp +appveyor.yml From 53e03076dad7f58649a0562a40ff431157c3fe7c Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Sat, 7 Nov 2015 02:44:43 +0300 Subject: [PATCH 52/57] Speed up git prompt filtering This increases performance of git prompt filter by fetching branch name directly from `.git/HEAD` file instead of spawning `git` process. Apart from increasing performance this may also solve potential problems with `git` output, as reported in https://github.com/cmderdev/cmder/issues/692 --- config/cmder.lua | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/config/cmder.lua b/config/cmder.lua index b63fe95..836540d 100644 --- a/config/cmder.lua +++ b/config/cmder.lua @@ -118,17 +118,23 @@ end --- -- Find out current branch - -- @return {false|git branch name} + -- @return {nil|git branch name} --- -function get_git_branch() - for line in io.popen("git branch 2>nul"):lines() do - local m = line:match("%* (.+)$") - if m then - return m - end - end +function get_git_branch(git_dir) + local git_dir = git_dir or get_git_dir() - return false + -- If git directory not found then we're probably outside of repo + -- or something went wrong. The same is when head_file is nil + local head_file = git_dir and io.open(git_dir..'/HEAD') + if not head_file then return end + + local HEAD = head_file:read() + head_file:close() + + -- if HEAD matches branch expression, then we're on named branch + -- otherwise it is a detached commit + local branch_name = HEAD:match('ref: refs/heads/(.+)') + return branch_name or 'HEAD detached at '..HEAD:sub(1, 7) end --- @@ -147,9 +153,10 @@ function git_prompt_filter() dirty = "\x1b[31;1m", } - if get_git_dir() then + local git_dir = get_git_dir() + if git_dir then -- if we're inside of git repo then try to detect current branch - local branch = get_git_branch() + local branch = get_git_branch(git_dir) if branch then -- Has branch => therefore it is a git folder, now figure out status if get_git_status() then @@ -181,4 +188,4 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do -- so config reloading using Alt-Q won't reload updated modules. dofile(filename) end -end \ No newline at end of file +end From b018f2cc5053a36f818fea2a13326ea27c9041ca Mon Sep 17 00:00:00 2001 From: Alec Wenzowski Date: Wed, 11 Nov 2015 23:28:04 -0500 Subject: [PATCH 53/57] 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 54/57] :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 55/57] :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 56/57] 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 57/57] 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%" ) )