touch up clink.lua

⬆️ Update git-for-windows to v2.15.0.windows.1
Merge pull request #1417 from gucong3000/patch-2
2025-07-17 04:59:09 +08:00 · 2017-11-03 13:13:51 +01:00 · 2017-11-01 11:32:18 +00:00 · 2017-10-31 21:09:23 +00:00 · 2017-10-29 10:46:38 +01:00 · 2017-10-28 14:21:38 +02:00
17 changed files with 266 additions and 125 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@ config/user-*
 config/aliases
 config/profile.d
 .github_changelog_generator
+launcher/.vs
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Samuel Vasko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Cmder

-[![Join the chat at https://gitter.im/cmderdev/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/branch/master?svg=true)](https://ci.appveyor.com/project/MartiUK/cmder)
+[![Join the chat at https://gitter.im/cmderdev/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/github/cmderdev/cmder?branch=master&svg=true)](https://ci.appveyor.com/project/MartiUK/cmder)

 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.

@ -14,7 +14,7 @@ The main advantage of Cmder is portability. It is designed to be totally self-co

 1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
 2. Extract the archive
-3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH
+3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH. (nb: This path should not be `C:\Program Files` or anywhere else that would require Administrator access for modifying configuration files)
 4. Run Cmder.exe

 ## Integration
@ -38,6 +38,9 @@ In a file explorer window right click in or on a directory to see "Cmder Here" i
 * <kbd>Ctrl</kbd> + <kbd>W</kbd> : Close tab
 * <kbd>Ctrl</kbd> + <kbd>D</kbd> : Close tab (if pressed on empty command)
 * <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>#Number</kbd> : Fast new tab: <kbd>1</kbd> - CMD, <kbd>2</kbd> - PowerShell
+* <kbd>Ctrl</kbd> + <kbd>Tab</kbd> : Switch to next tab
+* <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd> : Switch to previous tab
+* <kbd>Ctrl</kbd> + <kbd>#Number</kbd> : Switch to tab #Number
 * <kbd>Alt</kbd> + <kbd>Enter</kbd>: Fullscreen

 ### Shell
@ -109,16 +112,39 @@ You can define simple aliases for `cmd.exe` sessions with a command like `alias

 Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/doskey.mspx?mfr=true) for additional details on complex aliases/macros for 'cmd.exe'

-Aliases defined using the `alias.bat` command will automatically be saved in the `%CMDER_ROOT%\config\aliases` file
+Aliases defined using the `alias.bat` command will automatically be saved in the `%CMDER_ROOT%\config\user-aliases.cmd` file
+
+To make an alias and/or any other profile settings permanent add it to one of the following:
+
+Note: These are loaded in this order by '$CMDER_ROOT/vendor/init.bat'.  Anyhing stored in '%CMDER_ROOT%' will be a portable setting and will follow cmder to another machine.
+
+* '%CMDER_ROOT%\\config\\profile.d\\\*.cmd and \*.bat'
+* '%CMDER_ROOT%\\config\\user-aliases.cmd'
+* '%CMDER_ROOT%\\config\\user-profile.cmd'

 #### Bash.exe|Mintty.exe Aliases
-Bash shells support simple and complex aliases with optional parameters natively so they work a little different.  Typing `alias name=command` will create an alias only for the current running session.  To make an alias permanent add it to either your `$CMDER_ROOT/config/user-profile.sh` or your `$HOME/.bashrc`.
+Bash shells support simple and complex aliases with optional parameters natively so they work a little different.  Typing `alias name=command` will create an alias only for the current running session.
+
+To make an alias and/or any other profile settings permanent add it to one of the following:
+
+Note: These are loaded in this order by '$CMDER_ROOT/vendor/git-for-windows/etc/profile.d/cmder.sh'.  Anyhing stored in '$CMDER_ROOT' will be a portable setting and will follow cmder to another machine.
+
+* '$CMDER_ROOT/config/profile.d/*.sh'
+* '$CMDER_ROOT/config/user-profile.sh'
+* '$HOME/.bashrc'

 If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will be portable and follow your Cmder folder if you copy it to another machine.  `$HOME/.bashrc` defined aliases are not portable.

 #### PowerShell.exe Aliases
 PowerShell has native simple alias support, for example `[new-alias | set-alias] alias command`, so complex aliases with optional parameters are not supported in PowerShell sessions.  Type `get-help [new-alias|set-alias] -full` for help on PowerShell aliases.

+To make an alias and/or any other profile settings permanent add it to one of the following:
+
+Note: These are loaded in this order by '$ENV:CMDER_ROOT\\vendor\\user-profile.ps1'.  Anyhing stored in '$ENV:CMDER_ROOT' will be a portable setting and will follow cmder to another machine.
+
+* '$ENV:CMDER_ROOT\\config\\profile.d\\\*.ps1'
+* '$ENV:CMDER_ROOT\\config\\user-profile.ps1'
+
 ### SSH Agent

 To start SSH agent simply call `start-ssh-agent`, which is in the `vendor/git-for-windows/cmd` folder.
@ -131,7 +157,7 @@ If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_R
 1. Click the '+' button to add a task.
 1. Name the new task in the top text box.
 1. Provide task parameters, this is optional.
-1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console:d:%USERPROFILE%``` to the `Commands` text box.
+1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console``` to the `Commands` text box.

 Recommended Optional Steps:

@ -150,11 +176,11 @@ Uncomment and edit the below line in the script to use Cmder config even when la
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
 ```

-## Current development branch
+## Current development builds

 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)
+[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?svg=True)](https://ci.appveyor.com/project/MartiUK/cmder/branch/master/artifacts)

 ## License

--- a/appveyor.yml
+++ b/appveyor.yml
@ -15,7 +15,7 @@ branches:
 #---------------------------------#

 # Operating system (build VM template)
-os: Windows Server 2012 R2
+os: Visual Studio 2017

 #---------------------------------#
 #       build configuration       #
--- a/bin/alias.bat
+++ b/bin/alias.bat
@ -64,7 +64,7 @@ if "%aliases%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
 )

 :: validate alias
-for /f "delims== tokens=1,2 usebackq" %%G in (`echo "%_x%"`) do (
+for /f "delims== tokens=1,* usebackq" %%G in (`echo "%_x%"`) do (
  set alias_name=%%G
  set alias_value=%%H
 )
@ -96,7 +96,7 @@ set del_alias=%~1
 findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
-doskey /macrofile=%ALIASES%
+doskey /macrofile="%ALIASES%"
 goto:eof

 :p_reload
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@ -153,7 +153,7 @@
 			<value name="ComSpec.UpdateEnv" type="hex" data="00"/>
 			<value name="ComSpec.EnvAddPath" type="hex" data="01"/>
 			<value name="ComSpec.EnvAddExePath" type="hex" data="01"/>
-			<value name="ComSpec.UncPaths" type="hex" data="00"/>
+			<value name="ComSpec.UncPaths" type="hex" data="01"/>
 			<value name="ComSpec.Path" type="string" data=""/>
 			<value name="ConsoleTextSelection" type="hex" data="01"/>
 			<value name="CTS.AutoCopy" type="hex" data="01"/>
@ -488,7 +488,7 @@
 				<key name="Task1" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{cmd::Cmder as Admin}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="*cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
@ -497,7 +497,7 @@
 				<key name="Task2" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{cmd::Cmder}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
@ -507,7 +507,7 @@
 					<value name="Name" type="string" data="{Powershell::PowerShell as Admin}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
+					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Flags" type="dword" data="00000000"/>
@ -516,7 +516,7 @@
 					<value name="Name" type="string" data="{Powershell::Powershell}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
+					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console"/>
 					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
@ -527,7 +527,7 @@
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 				</key>
@ -536,10 +536,10 @@
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
-					<value name="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%userProfile%"/>
+					<value name="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
-					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%userProfile%"/>
+					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console"/>
 				</key>
 				<key name="Task7" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{bash::bash as Admin}"/>
@ -548,14 +548,14 @@
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
-					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i -new_console"/>
 				</key>
 				<key name="Task8" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{bash::bash}"/>
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 				</key>
--- a/config/Readme.md
+++ b/config/Readme.md
@ -3,12 +3,12 @@
 All config files must be in this folder. If there is no option to set this folder 
 directly, it has to be hardlinked.

-* `aliases`: aliases in cmd; called form vendor\init.bat; autocreated from
-  `vendor\aliases.example`.
-* `*.lua`: clink completions and prompt filters; called from vendor\cmder.lua after all
-  other prompt filter and clink completions are initialized; add your own.
-* `user_profile.{sh|bat|ps1}`: startup files for bash|cmd|powershell tasks; called from their
-  respective startup scripts in `vendor\`; autocreated on first start of such a task
-* `.history`: the current commandline history; autoupdated on close
-* `settings`: settings for readline; overwritten on update
-* `ConEmu.xml`: settings from ConEmu (=the UI of cmder -> Preferences); overwritten on update
+* `user-aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
+  `vendor\user-aliases.cmd.example`.
+* `*.lua`: clink completions and prompt filters; autoloaded after all
+  prompt filter and clink completions are initialized; add your own.
+* `user-profile.{sh|cmd|ps1}`: startup files for bash|cmd|powershell tasks; called from their
+  respective startup scripts in `vendor\`; autocreated on first start of such a task.
+* `.history`: the current commandline history; autoupdated on close.
+* `settings`: settings for readline; overwritten on update.
+* `ConEmu.xml`: settings from ConEmu (=the UI of cmder -> Preferences); overwritten on update.
--- a/launcher/CmderLauncher.vcxproj
+++ b/launcher/CmderLauncher.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -19,13 +19,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -95,7 +95,7 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }

-void StartCmder(std::wstring path, bool is_single_mode)
+void StartCmder(std::wstring path, bool is_single_mode, std::wstring taskName = L"")
 {
 #if USE_TASKBAR_API
 	wchar_t appId[MAX_PATH] = { 0 };
@ -180,6 +180,10 @@ void StartCmder(std::wstring path, bool is_single_mode)
 		swprintf_s(args, L"/Icon \"%s\" /Title Cmder", icoPath);
 	}

+	if (!taskName.empty()) {
+		swprintf_s(args, L"%s /run {%s}", args, taskName.c_str());
+	}
+
 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
 	if (!streqi(path.c_str(), L""))
 	{
@ -323,6 +327,10 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	{
 		StartCmder(opt.second, true);
 	}
+	else if (streqi(opt.first.c_str(), L"/TASK"))
+	{
+		StartCmder(L"", false, opt.second);
+	}
 	else if (streqi(opt.first.c_str(), L"/REGISTER"))
 	{
 		RegisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
@ -335,7 +343,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n  /START <path>\n  /SINGLE <path>\n  /REGISTER [USER/ALL]\n  /UNREGISTER [USER/ALL]", MB_TITLE, MB_OK);
+		MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n  /START <path>\n  /SINGLE <path>\n  /TASK <name>\n /REGISTER [USER/ALL]\n  /UNREGISTER [USER/ALL]", MB_TITLE, MB_OK);
 		return 1;
 	}

--- a/1
+++ b/1
@ -19,3 +19,4 @@ appveyor.yml
 vendor\cmder.sh
 vendor\git-prompt.sh
 config\user-*
+.github_changelog_generator
--- a/scripts/pack.ps1
+++ b/scripts/pack.ps1
@ -53,6 +53,6 @@ $version = Invoke-Expression "git describe --abbrev=0 --tags"

 foreach ($t in $targets.GetEnumerator()) {
    Create-Archive $cmderRoot "$saveTo\$($t.Name)" $t.Value
-    $hash = (Digest-MD5 "$saveTo\$($t.Name)")
-    Add-Content "$saveTo\hashes.txt" $hash
+    $hash = (Digest-Hash "$saveTo\$($t.Name)")
+    Add-Content -path "$saveTo\hashes.txt" -value ($t.Name + ' ' + $hash)
 }
--- a/scripts/utils.ps1
+++ b/scripts/utils.ps1
@ -1,4 +1,4 @@
-function Ensure-Exists ($path) {
+function Ensure-Exists($path) {
    if (-not (Test-Path $path)) {
        Write-Error "Missing required $path! Ensure it is installed"
        exit 1
@ -6,7 +6,7 @@ function Ensure-Exists ($path) {
    return $true > $null
 }

-function Ensure-Executable ($command) {
+function Ensure-Executable($command) {
    try { Get-Command $command -ErrorAction Stop > $null }
    catch {
        If( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){
@ -22,12 +22,12 @@ function Ensure-Executable ($command) {
    }
 }

-function Delete-Existing ($path) {
+function Delete-Existing($path) {
    Write-Verbose "Remove $path"
    Remove-Item -Recurse -force $path -ErrorAction SilentlyContinue
 }

-function Extract-Archive ($source, $target) {
+function Extract-Archive($source, $target) {
    Write-Verbose $("Extracting Archive '$cmder_root\vendor\" + $source.replace('/','\') + " to '$cmder_root\vendor\$target'")
    Invoke-Expression "7z x -y -o`"$($target)`" `"$source`"  > `$null"
    if ($lastexitcode -ne 0) {
@ -36,7 +36,7 @@ function Extract-Archive ($source, $target) {
    Remove-Item $source
 }

-function Create-Archive ($source, $target, $params) {
+function Create-Archive($source, $target, $params) {
    $command = "7z a -x@`"$source\packignore`" $params $target $source  > `$null"
    Write-Verbose "Running: $command"
    Invoke-Expression $command
@ -47,22 +47,22 @@ function Create-Archive ($source, $target, $params) {

 # If directory contains only one child directory
 # Flatten it instead
-function Flatten-Directory ($name) {
+function Flatten-Directory($name) {
    $child = (Get-Childitem $name)[0]
    Rename-Item $name -NewName "$($name)_moving"
    Move-Item -Path "$($name)_moving\$child" -Destination $name
    Remove-Item -Recurse "$($name)_moving"
 }

-function Digest-MD5 ($path) {
+function Digest-Hash($path) {
    if(Get-Command Get-FileHash -ErrorAction SilentlyContinue){
-        return (Get-FileHash -Algorithm MD5 -Path $path).Hash
+        return (Get-FileHash -Algorithm SHA256 -Path $path).Hash
    }

    return Invoke-Expression "md5sum $path"
 }

-function Register-Cmder(){
+function Register-Cmder() {
    [CmdletBinding()]
    Param
    (
@ -76,7 +76,7 @@ function Register-Cmder(){
        $Command = "%V"

        , # Defaults to the icons folder in the cmder package.
-        $icon = (Split-Path $PathToExe | join-path -ChildPath 'icons/cmder.ico')
+        $icon = (Split-Path $PathToExe | Join-Path -ChildPath 'icons/cmder.ico')
    )
    Begin
    {
@ -100,7 +100,7 @@ function Register-Cmder(){
    }
 }

-function Unregister-Cmder{
+function Unregister-Cmder {
    Begin
    {
        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT > $null
@ -124,9 +124,9 @@ function Download-File {
    # I think this is the problem
    $File = $File -Replace "/", "\"
    Write-Verbose "Downloading from $Url to $File"
-    $wc = new-object System.Net.WebClient
+    $wc = New-Object System.Net.WebClient
    if ($env:https_proxy) {
-      $wc.proxy = (new-object System.Net.WebProxy($env:https_proxy))
+      $wc.proxy = (New-Object System.Net.WebProxy($env:https_proxy))
    }
    $wc.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetworkCredentials;
    $wc.DownloadFile($Url, $File)
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@ -3,9 +3,10 @@
 -- !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 -- !!! Use "%CMDER_ROOT%\config\<whatever>.lua" to add your lua startup scripts

+-- luacheck: globals clink

 -- At first, load the original clink.lua file
-- this is needed as we set the script path to this dir and therefore the original 
+-- this is needed as we set the script path to this dir and therefore the original
 -- clink.lua is not loaded.
 local clink_lua_file = clink.get_env('CMDER_ROOT')..'\\vendor\\clink\\clink.lua'
 dofile(clink_lua_file)
@ -26,7 +27,7 @@ function set_prompt_filter()
    local old_prompt = clink.prompt.value
    local cwd = old_prompt:match('.*(.:[^>]*)>')
    if cwd == nil then cwd = clink.get_cwd() end
-    
+
    -- environment systems like pythons virtualenv change the PROMPT and usually
    -- set some variable. But the variables are differently named and we would never
    -- get them all, so try to parse the env name out of the PROMPT.
@ -34,11 +35,12 @@ function set_prompt_filter()
    local env = old_prompt:match('.*%(([^%)]+)%).+:')
    -- also check for square brackets
    if env == nil then env = old_prompt:match('.*%[([^%]]+)%].+:') end
-    
+
    -- build our own prompt
    -- orig: $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m
    -- color codes: "\x1b[1;37;40m"
-    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg} \n\x1b[1;30;40m{lamb} \x1b[0m"
+    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg}{svn} \n\x1b[1;39;40m{lamb} \x1b[0m"
+    local lambda
    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", cwd)
    if env == nil then
        lambda = "λ"
@ -103,6 +105,20 @@ local function get_hg_dir(path)
    return get_dir_contains(path, '.hg')
 end

+local function get_svn_dir(path)
+    return get_dir_contains(path, '.svn')
+end
+function get_svn_branch(svn_dir)
+    for line in io.popen("svn info 2>nul"):lines() do
+        local m = line:match("^Relative URL:")
+        if m then
+            return line:sub(line:find("/")+1,line:len())
+        end
+    end
+
+    return false
+end
+
 -- adapted from from clink-completions' git.lua
 local function get_git_dir(path)

@ -118,7 +134,7 @@ local function get_git_dir(path)

    -- Checks if provided directory contains git directory
    local function has_git_dir(dir)
-        return #clink.find_dirs(dir..'/.git') > 0 and dir..'/.git'
+        return clink.is_dir(dir..'/.git') and dir..'/.git'
    end

    local function has_git_file(dir)
@ -170,6 +186,13 @@ function get_hg_status()
    return true
 end

+function get_svn_status()
+    for line in io.popen("svn status -q"):lines() do
+       return false
+    end
+    return true
+end
+
 function hg_prompt_filter()

    -- Colors for mercurial status
@ -181,6 +204,7 @@ function hg_prompt_filter()
    if get_hg_dir() then
        -- if we're inside of mercurial repo then try to detect current branch
        local branch = get_hg_branch()
+        local color
        if branch then
            -- Has branch => therefore it is a mercurial folder, now figure out status
            if get_hg_status() then
@ -204,7 +228,7 @@ end
 -- @return {nil|git branch name}
 ---
 function get_git_branch(git_dir)
-    local git_dir = git_dir or get_git_dir()
+    git_dir = git_dir or get_git_dir()

    -- If git directory not found then we're probably outside of repo
    -- or something went wrong. The same is when head_file is nil
@ -246,6 +270,7 @@ function git_prompt_filter()
    if git_dir then
        -- if we're inside of git repo then try to detect current branch
        local branch = get_git_branch(git_dir)
+        local color
        if branch then
            -- Has branch => therefore it is a git folder, now figure out status
            if get_git_status() then
@ -264,10 +289,38 @@ function git_prompt_filter()
    return false
 end

+function svn_prompt_filter()
+    -- Colors for svn status
+    local colors = {
+        clean = "\x1b[1;37;40m",
+        dirty = "\x1b[31;1m",
+    }
+
+    if get_svn_dir() then
+        -- if we're inside of svn repo then try to detect current branch
+        local branch = get_svn_branch()
+        local color
+        if branch then
+            if get_svn_status() then
+                color = colors.clean
+            else
+                color = colors.dirty
+            end
+
+            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", color.."("..branch..")")
+            return false
+        end
+    end
+
+    -- No mercurial present or not in mercurial file
+    clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", "")
+    return false
+end
 -- insert the set_prompt at the very beginning so that it runs first
 clink.prompt.register_filter(set_prompt_filter, 1)
 clink.prompt.register_filter(hg_prompt_filter, 50)
 clink.prompt.register_filter(git_prompt_filter, 50)
+clink.prompt.register_filter(svn_prompt_filter, 50)

 local completions_dir = clink.get_env('CMDER_ROOT')..'/vendor/clink-completions/'
 for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@ -1,22 +1,39 @@
-PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
-PS1="$PS1"'\[\033[32m\]'       # change to green
-PS1="$PS1"'\u@\h '             # user@host<space>
-PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
-PS1="$PS1"'\w'                 # current working directory
-if test -z "$WINELOADERNOEXEC"
+if test -f /etc/profile.d/git-sdk.sh
 then
-	GIT_EXEC_PATH="$(git --exec-path 2>/dev/null)"
-	COMPLETION_PATH="${GIT_EXEC_PATH%/libexec/git-core}"
-	COMPLETION_PATH="${COMPLETION_PATH%/lib/git-core}"
-	COMPLETION_PATH="$COMPLETION_PATH/share/git/completion"
-	if test -f "$COMPLETION_PATH/git-prompt.sh"
-	then
-		. "$COMPLETION_PATH/git-completion.bash"
-		. "$COMPLETION_PATH/git-prompt.sh"
-		PS1="$PS1"'\[\033[36m\]'  # change color to cyan
-		PS1="$PS1"'`__git_ps1`'   # bash function
-	fi
+  TITLEPREFIX=SDK-${MSYSTEM#MINGW}
+else
+  TITLEPREFIX=$MSYSTEM
 fi
-PS1="$PS1"'\[\033[0m\]'        # change color
-PS1="$PS1"'\n'                 # new line
-PS1="$PS1"'λ '                 # prompt: always λ 
+
+if test -f ~/.config/git/git-prompt.sh
+then
+  . ~/.config/git/git-prompt.sh
+else
+  PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
+  # PS1="$PS1"'\n'                 # new line
+  PS1="$PS1"'\[\033[32m\]'       # change to green
+  PS1="$PS1"'\u@\h '             # user@host<space>
+  # PS1="$PS1"'\[\033[35m\]'       # change to purple
+  # PS1="$PS1"'$MSYSTEM '          # show MSYSTEM
+  PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
+  PS1="$PS1"'\w'                 # current working directory
+  if test -z "$WINELOADERNOEXEC"
+  then
+    GIT_EXEC_PATH="$(git --exec-path 2>/dev/null)"
+    COMPLETION_PATH="${GIT_EXEC_PATH%/libexec/git-core}"
+    COMPLETION_PATH="${COMPLETION_PATH%/lib/git-core}"
+    COMPLETION_PATH="$COMPLETION_PATH/share/git/completion"
+    if test -f "$COMPLETION_PATH/git-prompt.sh"
+    then
+      . "$COMPLETION_PATH/git-completion.bash"
+      . "$COMPLETION_PATH/git-prompt.sh"
+      PS1="$PS1"'\[\033[36m\]'  # change color to cyan
+      PS1="$PS1"'`__git_ps1`'   # bash function
+    fi
+  fi
+  PS1="$PS1"'\[\033[0m\]'        # change color
+  PS1="$PS1"'\n'                 # new line
+  PS1="$PS1"'λ '                 # prompt: always λ 
+fi
+
+MSYS2_PS1="$PS1"               # for detection by MSYS2 SDK's bash.basrc
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -149,9 +149,9 @@ call "%user-aliases%"
 :: manually extracting the archive rather than executing the 7z sfx
 if exist "%CMDER_ROOT%\vendor\git-for-windows\post-install.bat" (
    call :verbose-output Running Git for Windows one time Post Install....
-    cd /d "%CMDER_ROOT%\vendor\git-for-windows\"
+    pushd "%CMDER_ROOT%\vendor\git-for-windows\"
    "%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat
-    cd /d %USERPROFILE%
+    pushd "%USERPROFILE%"
 )

 :: Set home path
@ -160,10 +160,9 @@ if not defined HOME set "HOME=%USERPROFILE%"
 :: This is either a env variable set by the user or the result of
 :: cmder.exe setting this variable due to a commandline argument or a "cmder here"
 if defined CMDER_START (
-    cd /d "%CMDER_START%"
+    pushd "%CMDER_START%"
 )

-
 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"
@ -173,7 +172,14 @@ if exist "%CMDER_ROOT%\config\user-profile.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 :: uncomment this to have the ssh agent load when cmder starts
    echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd"
+    echo.
+    echo :: uncomment this next two lines to use pageant as the ssh authentication agent
+    echo :: SET SSH_AUTH_SOCK=/tmp/.ssh-pageant-auth-sock
+    echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-pageant.cmd"
+    echo.
+    echo :: you can add your plugins to the cmder path like so
    echo :: set "PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%"
    echo.
    ) > "%CMDER_ROOT%\config\user-profile.cmd"
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@ -4,23 +4,31 @@
 # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 # !!! Use "%CMDER_ROOT%\config\user-profile.ps1" to add your own startup commands

-# We do this for Powershell as Admin Sessions because CMDER_ROOT is not beng set.
-if (! $ENV:CMDER_ROOT ) {
-    $ENV:CMDER_ROOT = resolve-path( $ENV:ConEmuDir + "\..\.." )
-}
-
-# Remove trailing '\'
-$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
-
 # Compatibility with PS major versions <= 2
 if(!$PSScriptRoot) {
    $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path
 }

+# We do this for Powershell as Admin Sessions because CMDER_ROOT is not beng set.
+if (! $ENV:CMDER_ROOT ) {
+    if ( $ENV:ConEmuDir ) {
+        $ENV:CMDER_ROOT = resolve-path( $ENV:ConEmuDir + "\..\.." )
+    } else {
+        $ENV:CMDER_ROOT = resolve-path( $PSScriptRoot + "\.." )
+    }
+}
+
+# Remove trailing '\'
+$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
+
+# do not load bundled psget if a module installer is already available
+# -> recent PowerShell versions include PowerShellGet out of the box
+$moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue | Out-Null)
+
 # Add Cmder modules directory to the autoload path.
 $CmderModulePath = Join-path $PSScriptRoot "psmodules/"

-if( -not $env:PSModulePath.Contains($CmderModulePath) ){
+if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ){
    $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }

@ -86,19 +94,6 @@ if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
 # Enhance Path
 $env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT"

-# Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d"
-# to source them at startup.
-if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
-  mkdir "$ENV:CMDER_ROOT\config\profile.d"
-}
-
-pushd $ENV:CMDER_ROOT\config\profile.d
-foreach ($x in ls *.ps1) {
-  # write-host write-host Sourcing $x
-  . $x
-}
-popd
-
 #
 # Prompt Section
 #   Users should modify their user-profile.ps1 as it will be safe from updates.
@ -113,6 +108,35 @@ popd
    checkGit($pwd.ProviderPath)
 }

+<#
+This scriptblock runs every time the prompt is returned.
+Explicitly use functions from MS namespace to protect from being overridden in the user session.
+Custom prompt functions are loaded in as constants to get the same behaviour
+#>
+[ScriptBlock]$Prompt = {
+    $realLASTEXITCODE = $LASTEXITCODE
+    $host.UI.RawUI.WindowTitle = Microsoft.PowerShell.Management\Split-Path $pwd.ProviderPath -Leaf
+    PrePrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
+    CmderPrompt
+    Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
+    PostPrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
+    $global:LASTEXITCODE = $realLASTEXITCODE
+    return " "
+}
+
+# Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d"
+# to source them at startup.
+if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
+  mkdir "$ENV:CMDER_ROOT\config\profile.d"
+}
+
+pushd $ENV:CMDER_ROOT\config\profile.d
+foreach ($x in Get-ChildItem *.ps1) {
+  # write-host write-host Sourcing $x
+  . $x
+}
+popd
+
 $CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user-profile.ps1"
 if(Test-Path $CmderUserProfilePath) {
    # Create this file and place your own command in there.
@ -160,22 +184,6 @@ Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant
 Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant
 Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant

-<#
-This scriptblock runs every time the prompt is returned.
-Explicitly use functions from MS namespace to protect from being overridden in the user session.
-Custom prompt functions are loaded in as constants to get the same behaviour
-#>
-[ScriptBlock]$Prompt = {
-    $realLASTEXITCODE = $LASTEXITCODE
-    $host.UI.RawUI.WindowTitle = Microsoft.PowerShell.Management\Split-Path $pwd.ProviderPath -Leaf
-    PrePrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
-    CmderPrompt
-    Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
-    PostPrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
-    $global:LASTEXITCODE = $realLASTEXITCODE
-    return " "
-}
-
 # Functions can be made constant only at creation time
 # ReadOnly at least requires `-force` to be overwritten
 Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly
--- a/vendor/sources.json
+++ b/vendor/sources.json
@ -1,22 +1,22 @@
 [
    {
        "name": "git-for-windows",
-        "version": "v2.11.0.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.11.0.windows.1/PortableGit-2.11.0-32-bit.7z.exe"
+        "version": "v2.15.0.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.15.0.windows.1/PortableGit-2.15.0-32-bit.7z.exe"
    },
    {
        "name": "clink",
-        "version": "0.4.8",
-        "url": "https://github.com/mridgers/clink/releases/download/0.4.8/clink_0.4.8.zip"
+        "version": "0.4.9",
+        "url": "https://github.com/Stanzilla/clink/releases/download/0.4.9/clink_DEV.zip"
    },
    {
        "name": "conemu-maximus5",
-        "version": "161022",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v16.10.22/ConEmuPack.161022.7z"
+        "version": "171025",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v17.10.25/ConEmuPack.171025.7z"
    },
    {
        "name": "clink-completions",
-        "version": "0.3.2",
-        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.2.zip"
+        "version": "0.3.3",
+        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.3.zip"
    }
 ]
Author	SHA1	Message	Date
Benjamin Staneck	46d468aea0	touch up clink.lua	2017-11-03 13:13:51 +01:00
Martin Kemp	dc27c53739	⬆️ Update git-for-windows to v2.15.0.windows.1	2017-11-01 11:32:18 +00:00
Jack	7479d620b1	Merge pull request #1417 from gucong3000/patch-2 Compatible with Visual Studio Code (PowerShell) integrated terminal.	2017-10-31 21:09:23 +00:00
Benjamin Staneck	a8d32611a9	Fix lamda color after a ConEmu change Seems like https://github.com/Maximus5/ConEmu/issues/1288 caused this	2017-10-29 10:46:38 +01:00
mrugesh mohapatra	b6042a7ca1	Create LICENSE	2017-10-28 14:21:38 +02:00
Angly Cat	dcf22af3c8	Remove startup directory overrive switch from command in README.md	2017-10-28 14:21:12 +02:00
Angly Cat	b58ff9bb53	Make default tasks respect "Startup directory for new process" "d" switch specified along with "-new_console" flag in default tasks commands made them to override chosen startup directory (effectively ignoring it), therefore it is removed. Closes #920, closes #1024, closes #1097, closes #1303.	2017-10-28 14:21:12 +02:00
Pero Pejovic	68d9425c89	Avoid using aliases in profile.ps1 Aliases such as `ls` may have been overridden in the user's profile script and the resulting behavior may be different from `Get-ChildItem`. For example binding `ls` to GNU `ls.exe` generates an error if there are no matching files.	2017-10-28 14:18:09 +02:00
Benjamin Staneck	a95cd140ef	⬆️ Update ConEmu to 171025 (alpha) Changelog: https://conemu.github.io/blog/2017/10/25/Build-171025.html	2017-10-28 12:30:54 +02:00
Benjamin Staneck	e90966c5c2	⬆️ Update Git to v2.14.4 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.3.windows.1	2017-10-28 12:29:46 +02:00
Benjamin Staneck	e104f20c5d	⬆️ clink-completions to 0.3.3 Changelog: https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.3	2017-10-28 12:28:31 +02:00
Benjamin Staneck	6883ba3b84	⬆️ Update ConEmu to 170910 (alpha) Changelog: https://conemu.github.io/blog/2017/09/10/Build-170910.html	2017-09-30 11:36:03 +02:00
Benjamin Staneck	1c1c08bb68	⬆️ Update Git to v2.14.2 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.2.windows.1	2017-09-30 11:36:03 +02:00
Joseph Caudle	a5eb4d7b4f	Add documentation about Program Files cmder should not be installed in `C:\Program Files` because it would need Administrator privileges to update configuration. This commit adds documentation to the installation instructions as described in #1200.	2017-08-30 03:36:36 +02:00
Benjamin Staneck	d88f1b0a97	Point to the artifacts on the master branch	2017-08-29 03:58:30 +02:00
Benjamin Staneck	8d74184d30	⬆️ clink to our forked version at 0.4.9 This should fix all the Windows 10 alias issues that we had.	2017-08-28 00:50:52 +02:00
Dax T Games	3ea6d51ba4	Update init.bat	2017-08-27 14:04:24 -05:00
Hugo-KTM	22d27afed5	Fix Cmder not changing to CMDER_START (#1399 ) * Fix Cmder not changing to CMDER_START Fix to allow Cmder to change to different startup directory if already on the same drive as CMDER_START possibly relevant: HOME != USERPROFILE * make "Cmder Here" work in more cases integrated suggestion from comments (test for trailing backslash to prevent doubling of trailing backslash) integrated suggestions from #1456: switching ```cd /d``` over to ```pushd``` to get support for UNC-paths * replaced 'cd /d' with 'pushd' replaced two more instances of 'cd /d' with 'pushd' to support network paths. Also added double quotes to the use of '%USERPROFILE%' to prevent issues with spaces. I also noticed that 'pushd', in contrast to 'cd /d' does not require the trailing backslash for drive roots (on Win7). Therefore I removed the trailing backslash check. * Don't assume / is needed at end * Update init.bat	2017-08-27 19:46:47 +02:00
Benjamin Staneck	e9a78a30d1	⬆️ Update Git to v2.14.1 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.1.windows.1	2017-08-10 22:34:46 +02:00
Benjamin Staneck	e92f7fbb55	⬆️ Update Git to v2.14.0 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.0.windows.1	2017-08-06 02:41:07 +02:00
刘祺	7ca2f5503a	Merge branch 'master' into patch-2 # Conflicts: # vendor/profile.ps1	2017-08-03 18:32:44 +08:00
Dax T Games	a34e17f2bd	Doc updates For profile/alias settings scripts, what loads them, and load order.	2017-07-28 03:35:37 +02:00
Alpha	1f9e743ef2	Added pagent ssh auth support (#1391 ) (and some comments on the user-profile.cmd file) Inspired by the comments from https://github.com/cmderdev/cmder/issues/193 and my personal need to use pageant instead of OpenSSH authentication agents (which is more Window user-friendly), I have used this approach which works as expected. Keeping the spirit of the current scripts, I left it disabled, and with some comments explaining what they all do.	2017-07-24 23:16:10 +02:00
Tian	f687281be0	Fixed quotation marks (#1360 ) 1. Changed " --login -i"" to "" --login -i" in ConEmu 2. Closed quotation in "alias.bat :p_del doskey" command of "%ALIASES%" Suppose %CMDER_ROOT% is "C:\Program Files\cmder", this BUG will be raised while we exec command of "unalias xxx" or creat terminal "{bash::bash}" and "{bash::mintty}", it will throws an error like: 'C:\Program' is not recognized as an internal or external command, operable program or batch file.	2017-07-24 23:14:17 +02:00
Benjamin Staneck	4c270699a1	⬆️ Update Git to v2.13.3 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.3.windows.1	2017-07-15 23:06:05 +02:00
Benjamin Staneck	b45e3adc67	Merge pull request #1407 from ZemingLiu/master add /TASK option	2017-07-15 17:59:38 +02:00
Benjamin Staneck	8077c1a612	Merge pull request #1441 from pyranja/fix-psget-clobbering Avoid clobbering Install-Module	2017-07-15 02:08:09 +02:00
Benjamin Staneck	d9fcf06e0f	Merge pull request #1434 from cmderdev/fix_git_prompt Fix git prompt	2017-07-14 18:23:03 +02:00
Chrs Borckholder	815b99b98b	Avoid clobbering Install-Module If the Install-Module command is available, do not include the bundled module path containing a deprecated version of PSGet. Recent powershell versions include PowerShellGet as standard module installer. Resolve #1318.	2017-07-14 12:06:48 +02:00
Dax T. Games	bcb60f8f59	cmder git prompt spacing	2017-07-10 22:23:51 -05:00
Dax T. Games	0877a6d995	cmder git prompt	2017-07-10 22:21:22 -05:00
ZemingLiu	71f5b446da	Merge pull request #1 from cmderdev/master update from origin	2017-06-28 02:09:45 -05:00
Benjamin Staneck	512787f391	⬆️ Update ConEmu to 170622 (preview) Changelog: https://conemu.github.io/blog/2017/06/22/Build-170622.html	2017-06-27 00:56:53 +02:00
Benjamin Staneck	262d92265e	⬆️ Update Git to v2.13.2.windows.1 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.2.windows.1	2017-06-27 00:55:58 +02:00
Wild.Farmer	409b92aac2	modify -cmd command line style to /cmd	2017-06-24 22:10:15 +08:00
Benjamin Staneck	aea1a977bf	⬆️ Update Git to v2.13.1(2) Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.1.windows.2	2017-06-23 18:18:21 +02:00
刘祺	a7237370e3	Compatible with Visual Studio Code (PowerShell)	2017-06-23 18:39:36 +08:00
Wild.Farmer	74d79ea628	add /TASK option	2017-06-17 22:29:06 +08:00
Benjamin Staneck	89c014bb05	⬆️ Update Git to v2.13.1 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.1.windows.1	2017-06-13 15:11:43 +02:00
Benjamin Staneck	c19237085d	⬆️ Update ConEmu to 170605 (preview) Changelog: https://conemu.github.io/blog/2017/06/05/Build-170605.html	2017-06-13 15:10:55 +02:00
Benjamin Staneck	9c4e77b498	⬆️ Update ConEmu to 170517 (preview) Changelog: https://conemu.github.io/blog/2017/05/17/Build-170517.html	2017-05-19 23:20:31 +02:00
Benjamin Staneck	c2cf56cc48	⬆️ Update Git to v2.13.0 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.0.windows.1	2017-05-10 22:03:36 +02:00
Benjamin Staneck	6e2d88d466	upgrade to VisualStudio 2017	2017-04-07 23:51:46 +02:00
Benjamin Staneck	cd3efdf382	ignore VisualStudio temp dir	2017-04-07 07:50:24 +02:00
Benjamin Staneck	53c7ec5886	don't package .github_changelog_generator file	2017-04-07 07:47:01 +02:00
Benjamin Staneck	e63368fe96	add file name next to hash values	2017-04-07 07:45:28 +02:00
Benjamin Staneck	aa2eaa6886	switch file hashes from MD5 to SHA256	2017-04-07 06:57:16 +02:00
Benjamin Staneck	bee82d00e8	Enable UNC paths by default closes #1315	2017-04-07 06:25:18 +02:00
Benjamin Staneck	02366fdc7e	Update README.md fix AppVeyor badge	2017-04-07 06:14:35 +02:00
Benjamin Staneck	399999d7f7	Merge pull request #1299 from alexandr-san4ez/master Changed the way directory is defined .git	2017-04-07 02:42:18 +02:00
Benjamin Staneck	8eea2baaa5	Merge pull request #1331 from dancread/svn-prompt Adding svn support to prompt	2017-04-07 02:40:35 +02:00
Benjamin Staneck	4d3950174f	⬆️ Update ConEmu to 170402 (preview) Changelog: https://conemu.github.io/blog/2017/04/02/Build-170402.html	2017-04-07 02:38:16 +02:00
Benjamin Staneck	24a110ddb7	⬆️ Update Git to v2.12.2(2) Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.2.windows.2	2017-04-07 02:36:32 +02:00
Benjamin Staneck	1dd0e600ac	⬆️ Update ConEmu to 170326 (preview) Changelog: https://conemu.github.io/blog/2017/03/26/Build-170326.html	2017-04-07 02:36:32 +02:00
Benjamin Staneck	e49b978b9a	⬆️ Update Git to v2.12.2 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.2.windows.1	2017-04-07 02:36:32 +02:00
Benjamin Staneck	9182c89a14	⬆️ Update ConEmu to 170316 (preview) Changelog: https://conemu.github.io/blog/2017/03/16/Build-170316.html	2017-04-07 02:36:32 +02:00
Benjamin Staneck	00622254a7	⬆️ Update Git to v2.12.1 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.1.windows.1	2017-04-07 02:36:32 +02:00
dr024625	9977c0563d	Adding svn support	2017-04-03 21:07:41 -05:00
Martin Kemp	b604bf0b6c	Merge pull request #1317 from rmorrin/master Update readme for config	2017-03-31 17:19:41 +01:00
Ryan Morrin	3b0a51d7b8	Update config readme: * Change descriptions to match updated filenames * Some minor fixes to grammar	2017-03-24 14:07:30 +00:00
Alexandr	018cc9ceda	Changed the way directory is defined .git clink.find_dirs - do not specify the directory if there is Cyrillic in the way. clink.is_dir - more logical and faster.	2017-03-09 19:22:13 +03:00
Jack	ad0f8fe049	Merge pull request #1280 from bdukes/patch-1 Allow profile.d/*.ps1 files to export [scriptblock]$prompt override all of cmders prompt	2017-03-08 22:06:50 +00:00
Brian Dukes	7f4a4d34d6	Allow user-profile.ps1 and profile.d/.ps1 files to override prompt This defines the default prompt variables ($PrePrompt, $PostPrompt, $CmderPrompt, and $Prompt) before running the custom scripts (user-profile.ps1 and profile.d/.ps1), and then saves those prompt values after running the custom scripts. This gives the custom scripts and opportunity to override the prompt code blocks. This now opens the possibility for profile.d/.ps1 scripts to affect the prompt, and also allows both user-profile.ps1 and profile.d/.ps1 scripts to overwrite the $Prompt script block and overwrite the prompt behavior entirely.	2017-03-08 14:14:35 -06:00
Benjamin Staneck	963a5a8be6	⬆️ Update Git to v2.12.0 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.0.windows.1	2017-03-01 04:01:24 +01:00
Benjamin Staneck	f04a4e4846	Merge pull request #1268 from mateusmedeiros/patch-1 Fix typo in config/Readme.md	2017-02-21 19:38:34 +01:00
Mateus Medeiros	50ed66894f	Fix typo in config/Readme.md The file config/Readme.md refers to the "user-profile" files with "_" instead of "-". This commit fixes that.	2017-02-21 12:04:10 -03:00
Benjamin Staneck	2bb5ce0986	Merge pull request #1252 from glucas/issue-1245 Fix #1245: Allow alias value to contain '=' characters	2017-02-10 01:08:06 +01:00
Greg Lucas	3b7a24b20a	Fix #1245 : Allow alias value to contain '=' characters	2017-02-09 13:53:39 -05:00
Benjamin Staneck	81d83d4c6d	⬆️ Update Git to v2.11.0.3 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.11.0.windows.3	2017-01-16 08:53:56 +01:00
Benjamin Staneck	61849dc7fd	⬆️ Update ConEmu to 161206 (stable) Changelog: https://conemu.github.io/blog/2016/12/06/Build-161206.html	2016-12-08 22:53:08 +01:00
Benjamin Staneck	9f2c0e4001	Merge pull request #1189 from knaos/master Documented some undocumented tab related shorcuts	2016-12-06 13:02:01 +01:00
Atanas Kaynarov	4195b5b0ed	Documented some undocumented tab related shorcuts	2016-12-06 12:39:03 +02:00