Update CHANGELOG.md

Update Changelog Tag url after merge
New cmder.exe args and shared install capability (#1696 )
2025-07-16 20:49:54 +08:00 · 2018-03-13 18:18:46 -05:00 · 2018-03-13 16:38:27 +01:00 · 2018-03-08 12:01:48 +01:00 · 2018-02-22 19:20:08 +00:00 · 2018-02-20 20:20:23 +01:00
23 changed files with 1479 additions and 541 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1,7 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+*.cmd text eol=crlf
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+*.md text eol=lf
+*.sh text eol=lf
--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,8 @@ build/
 Version v*
 *.bak
 config/user-*
+config/settings
 config/aliases
 config/profile.d
 .github_changelog_generator
+launcher/.vs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,105 @@
 # Change Log

-## [1.3.2](https://github.com/cmderdev/cmder/tree/1.3.2) (2016-12-01)
+## [1.3.6-pre1](https://github.com/cmderdev/cmder/tree/v1.3.6-pre1) (2018-03-01)
+
+**Fixed bugs:**
+
+* Fixed Git version check recently added to master.
+
+**Updates:**
+
+* Modified Cmder tasks in default Conemu.xml to allow easily adding command line args for init.bat by adding some quotes.  This resulted in a ton of misc changes to this file.  See Adds below.
+* Reworked `cmder.exe` command line argument handling to make it more flexible and easily added to.
+* Reworked README.md tables to make them more readable in editors
+
+**Implemented enhancements:**
+
+* Added `cmder.exe` command line args documenttion to `README.md`
+* Added `:enhance_path` method to vendor\init.bat that modifies the path only if required.
+   * To prepend: `call :enhance_path "%cmder_root%"`
+   * to append: `call :enhance_path "%cmder_root%" append`
+* Added `:enhance_path_recursive` method to vendor\init.bat that adds a path and all its sub directories to the path if required.  
+   * Max recurse depth default is '1' configurable using `init.bat /max_depth [1-5]`. 6+ results in error. 
+   * To prepend and go 3 levels deep: `call :enhance_path "%cmder_root%" 3`
+   * To append and go 2 levels deep: `call :enhance_path "%cmder_root%" 2 append`
+* Added ability to init.bat to accept command line args and documented them in README.md.  Allows users to change the behaviour of init.bat without editing the file.
+
+| Argument                      | Description                                                                                      | Default                               |
+| ----------------------------- | ----------------------------------------------------------------------------------------------   | ------------------------------------- |
+| /c [user cmder root]          | Enables user bin and config folders for 'Cmder as admin' sessions due to non-shared environment. | not set                               |
+| /d                            | Enables debug output.                                                                            | not set                               |
+| /git_install_root [file path] | User specified Git installation root path.                                                       | '%CMDER_ROOT%\vendor\Git-for-Windows' |
+| /home [home folder]           | User specified folder path to set `%HOME%` environment variable.                                 | '%userprofile%'                       |
+| /max_depth [1-5]              | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`   | 1                                     |
+| /svn_ssh [path to ssh.exe]    | Define %SVN_SSH% so we can use git svn with ssh svn repositories.                                | '%GIT_INSTALL_ROOT%\bin\ssh.exe'      |
+| /user_aliases [file path]     | File path pointing to user aliases.                                                              | '%CMDER_ROOT%\config\user-liases.cmd' |
+| /v                            | Enables verbose output.                                                                          | not set                               |
+
+* Added new `cmder.exe /C \<path\>` argument
+   * To use run Cmder.exe with "/C" command line argument. Example: `cmder.exe /C %userprofile%\cmder_config`
+   * To use run with `Cmder as Admin` sessions you must specify "/c" command line argument to `init.bat` in tasks. See [README.md](./Readme.md) for details.
+   * Enables shared Cmder install with Non-Portable Individual User Config
+   * Supported by all supported shells (cmder, powershell, git bash, and external bash)
+   * This will create the following directory structure if it is missing.
+
+      ```
+      c:\users\[username]\cmder_config
+      ├───bin
+      └───config
+          └───profile.d
+      ```
+
+   * Shell init scripts run in the following order
+      1. %cmder_root%\config\profile.d\*.[cmd|ps1|sh]
+      1. %cmder_root%\config\user-profile.[cmd|ps1|sh]
+      1. %userprofile%\cmder_config\config\profile.d\*.[cmd|ps1|sh]
+      1. %userprofile%\cmder_config\config\user-profile.[cmd|ps1|sh]
+
+## [1.3.5](https://github.com/cmderdev/cmder/releases/tag/v1.3.5) (2018-02-11)
+
+This is the first Cmder release that comes with Git for Windows in the 64bit version. If you are still using a 32bit version, you have to fix this yourself.
+
+**Updated components:**
+- Git updated to v2.16.1.windows.4
+- clink updated to 0.4.9 (official version)
+- ConEmu updated to 180206
+
+**Fixed bugs:**
+
+- use /dir Switch instead of CMDER_START (previously [\#921](https://github.com/cmderdev/cmder/pull/921)) [\#1609](https://github.com/cmderdev/cmder/pull/1609) ([Stanzilla](https://github.com/Stanzilla))
+- add config/settings to .gitignore [\#1592](https://github.com/cmderdev/cmder/pull/1592) ([daxgames]((https://github.com/daxgames)))
+- Upgrade #1591 ([daxgames]((https://github.com/daxgames)))
+- Fix startup folder issue [\#1547](https://github.com/cmderdev/cmder/pull/1547) (dr-tony-lin)
+- Fix alias.bat handling "user-aliases.cmd" with spaces [\#1531](https://github.com/cmderdev/cmder/pull/1531) ([Varriount](https://github.com/Varriount))
+- Compatible with Visual Studio Code (cmd) [\#1416](https://github.com/cmderdev/cmder/pull/1416) ([gucong3000](https://github.com/gucong3000))
+
+## [1.3.4](https://github.com/cmderdev/cmder/releases/tag/v1.3.4) (2017-11-03)
+
+We now use a forked version of clink since it's original author is missing and we needed Windows 10 compat.
+
+**Updated components:**
+
+- Git: v2.15.0.windows.1
+
+**Fixed bugs:**
+
+- Fix lamda color after a ConEmu change: [a8d3261](https://github.com/cmderdev/cmder/commit/a8d32611a9b93cfb58f0318ae4b8041bc8a86c68)
+- Compatible with Visual Studio Code (PowerShell): [\#1417](https://github.com/cmderdev/cmder/pull/1417)
+- Make default tasks respect "Startup directory for new process": [b58ff9b](https://github.com/cmderdev/cmder/commit/b58ff9bb539d7f908f427fa34f377e1513fcd825)
+
+
+## [1.3.3](https://github.com/cmderdev/cmder/releases/tag/v1.3.3) (2017-10-28)
+
+We now use a forked version of clink since it's original author is missing and we needed Windows 10 compat.
+
+**Updated components:**
+
+- Git: v2.14.3.windows.1
+- ConEmu: 170910
+- Clink: 0.4.9-FORK
+- Clink-Completions: 0.3.3
+
+## [1.3.2](https://github.com/cmderdev/cmder/releases/tag/v1.3.2) (2016-12-01)
 **Implemented enhancements:**

 - Change appveyor.yml to publish all resulting artifacts from builds. [\#717](https://github.com/cmderdev/cmder/issues/717)
--- 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.

@ -11,13 +11,42 @@ Cmder is a **software package** created out of pure frustration over absence of
 The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, which 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
+### Single User Portable Config

 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
+2. Extract the archive. *Note: This path should not be `C:\Program Files` or anywhere else that would require Administrator access for modifying configuration files*
+3. (optional) Place your own executable files into the `%cmder_root%\bin` folder to be injected into your PATH.
 4. Run Cmder.exe

-## Integration
+### Shared Cmder install with Non-Portable Individual User Config
+1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
+2. Extract the archive to a shared location.
+3. (optional) Place your own executable files into the `%cmder_root%\bin` folder to be injected into your PATH.
+4. (optional) Create `%userprofile%\cmder_config\bin` folder to be injected into individual users PATH.  Default is to auto create this on first run.
+5. (optional) Place your own executable files into the `%userprofile%\cmder_config\bin` folder to be injected into your PATH.
+6. Run Cmder.exe with "/C" command line argument. Example: `cmder.exe /C %userprofile%\cmder_config`
+   * This will create the following directory structure if it is missing.
+
+     ```
+     c:\users\[username]\cmder_config
+     ├───bin
+     └───config
+         └───profile.d
+     ```
+
+* Both the shared install and the individual user config locations can contain a full set of init and profile.d scripts enabling shared config with user overrides.  See below.
+
+## Cmder.exe Command Line Arguments
+
+
+| Argument            | Description                                                             |
+| ------------------- | ----------------------------------------------------------------------- |
+| /C [user_root_path] | Individual user Cmder root folder.  Example: %userprofile%\cmder_config |
+| /SINGLE             | Start Cmder is single mode.                                             |
+| /START [start_path] | Folder path to start in.                                                |
+| /TASK [task_name]   | Task to start after launch.                                             |
+
+## Context Menu Integration

 So you've experimented with Cmder a little and want to give it a shot in a more permanent home;

@ -38,6 +67,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
@ -82,24 +114,50 @@ cd mintty-colors-solarized/
 echo source \$CMDER_ROOT/vendor/mintty-colors-solarized/mintty-solarized-dark.sh>>$CMDER_ROOT/config/user-profile.sh
 ```

-### Cmder Portable Shell User Config
-User specific configuration is possible using the cmder specific shell config files.  Edit the below files to add your own configuration:
+### Changing Cmder Default 'cmd.exe' Shell Startup Behaviour Using Task Arguments
+
+1. Press <kbd>Win</kbd> + <kbd>Alt</kbd> + <kbd>T</kbd>
+1. Click either:
+  * `1. {cmd::Cmder as Admin}`
+  * `2. {cmd::Cmder}`
+1. Add command line argumentswhere specified below:
+
+  *Note: Pay attention to the quotes!*
+
+  ```
+  cmd /s /k ""%ConEmuDir%\..\init.bat" [ADD ARGS HERE]"
+  ```
+
+##### Command Line Arguments for `init.bat`
+
+| Argument                      | Description                                                                                      | Default                               |
+| ----------------------------- | ----------------------------------------------------------------------------------------------   | ------------------------------------- |
+| /c [user cmder root]          | Enables user bin and config folders for 'Cmder as admin' sessions due to non-shared environment. | not set                               |
+| /d                            | Enables debug output.                                                                            | not set                               |
+| /git_install_root [file path] | User specified Git installation root path.                                                       | '%CMDER_ROOT%\vendor\Git-for-Windows' |
+| /home [home folder]           | User specified folder path to set `%HOME%` environment variable.                                 | '%userprofile%'                       |
+| /max_depth [1-5]              | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`   | 1                                     |
+| /svn_ssh [path to ssh.exe]    | Define %SVN_SSH% so we can use git svn with ssh svn repositories.                                | '%GIT_INSTALL_ROOT%\bin\ssh.exe'      |
+| /user_aliases [file path]     | File path pointing to user aliases.                                                              | '%CMDER_ROOT%\config\user-liases.cmd' |
+| /v                            | Enables verbose output.                                                                          | not set                               |
+
+### Cmder Shell User Config
+Single user portable configuration is possible using the cmder specific shell config files.  Edit the below files to add your own configuration:

 | Shell         | Cmder Portable User Config                |
-| ------------- |:-------------:|
-|Cmder|%CMDER_ROOT%\config\user-profile.cmd|
-|PowerShell|$ENV:CMDER_ROOT\config\user-profile.ps1|
+| ------------- | ----------------------------------------- |
+| Cmder         | %CMDER_ROOT%\\config\\user-profile.cmd    |
+| PowerShell    | $ENV:CMDER_ROOT\\config\\user-profile.ps1 |
 | Bash/Mintty   | $CMDER_ROOT/config/user-profile.sh        |

 Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file if it exists after it sources '$CMDER_ROOT/config/user-profile.sh'.

-### Linux like 'profile.d' support for all supported shell types.
 You can write *.cmd|*.bat, *.ps1, and *.sh scripts and just drop them in the %CMDER_ROOT%\config\profile.d folder to add startup config to Cmder.

 | Shell         | Cmder 'Profile.d' Scripts                         |
-| ------------- |:-------------:|
-|Cmder|%CMDER_ROOT%\config\profile.d\\*.bat and *.cmd|
-|PowerShell|$ENV:CMDER_ROOT\config\profile.d\\*.ps1|
+| ------------- | --------------------------------------------------|
+| Cmder         | %CMDER_ROOT%\\config\\profile.d\\\*.bat and *.cmd |
+| PowerShell    | $ENV:CMDER_ROOT\\config\\profile.d\\\*.ps1        |
 | Bash/Mintty   | $CMDER_ROOT/config/profile.d/*.sh                 |


@ -109,29 +167,58 @@ 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.
+To start the vendored 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, include the line `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"` in `%CMDER_ROOT%/config/user-profile.cmd` (usually just uncomment it).

+### Vendored Git
+
+Cmder is by default shipped with a vendored Git installation.  On each instance of launching Cmder, an attempt is made to locate any other user provided Git binaries. Upon finding a `git.exe` binary, Cmder further compares its version against the vendored one _by executing_ it. The vendored `git.exe` binary is _only_ used when it is more recent than the user-installed one.
+
+You may use your favorite version of Git by including its path in the `%PATH%` enviroment variable.  Moreover, the **Mini** edition of Cmder (found on the [downloads page](https://github.com/cmderdev/cmder/releases)) excludes any vendored Git binaries.
+
 ### Using external Cygwin/Babun, MSys2, or Git for Windows SDK with Cmder.

 1. Setup a new task by pressing '<kbd>Win</kbd> +<kbd>Alt</kbd> + <kbd>T</kbd>'.
 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 +237,39 @@ 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
+## Upgrading
+
+The process of upgrading Cmder depends on the version/build you are currently running
+
+If you have a `[cmder_root]/config/user-conemu.xml`, you are running a newer version of Cmder, follow the below process: 
+
+1. Exit all Cmder sessions and relaunch `[cmder_root]/cmder.exe`, this backs up your existing `[cmder_root]/vendor/conemu-maximus5/conemu.xml` to `[cmder_root]/config/user-conemu.xml`.
+   
+   * The `[cmder_root]/config/user-conemu.xml` contains any custom settings you have made using the 'Setup Tasks' settings dialog.
+
+2. Exit all Cmder sessions and backup any files you have manually edited under `[cmder_root]/vendor`.
+
+   * Editing files under `[cmder_root]/vendor` is not recommended since you will need to re-apply these changes after any upgrade.  All user customizations should go in '[cmder_root]/config' folder.
+
+3.  Delete the `[cmder_root]/vendor` folder.
+4.  Extract the new `cmder.zip` or `cmder_mini.zip` into `[cmder_root]/` overwriting all files when prompted.
+
+If you do not have a `[cmder_root]/config/user-conemu.xml`, you are running an older version of cmder, follow the below process: 
+
+1. Exit all Cmder sessions and backup `[cmder_root]/vendor/conemu-maximus5/conemu.xml` to `[cmder_root]/config/user-conemu.xml`.
+
+2. Backup any files you have manually edited under `[cmder_root]/vendor`.
+
+   * Editing files under `[cmder_root]/vendor` is not recommended since you will need to re-apply these changes after any upgrade.  All user customizations should go in '[cmder_root]/config' folder.
+
+3.  Delete the `[cmder_root]/vendor` folder.
+4.  Extract the new `cmder.zip` or `cmder_mini.zip` into `[cmder_root]/` overwriting all files when prompted.
+
+## 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
@ -1,8 +1,8 @@
@echo off


-if "%aliases%" == "" (
-  set ALIASES=%CMDER_ROOT%\config\user-aliases.cmd
+if "%ALIASES%" == "" (
+  set ALIASES="%CMDER_ROOT%\config\user-aliases.cmd"
 )

 setlocal enabledelayedexpansion
@ -21,7 +21,7 @@ goto parseargument
  set currentarg=%~1

  if /i "%currentarg%" equ "/f" (
-    set aliases=%~2
+    set ALIASES=%~2
    shift
    goto :do_shift
  ) else if /i "%currentarg%" == "/reload" (
@ -50,21 +50,21 @@ goto parseargument
  )
 rem #endregion parseargument

-if "%aliases%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
-  set _x=!_x:/f %aliases% =!
+if "%ALIASES%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
+  set _x=!_x:/f "%ALIASES%" =!

-  if not exist "%aliases%" (
-    echo ;= @echo off>"%aliases%"
-    echo ;= rem Call DOSKEY and use this file as the macrofile>>"%aliases%"
-    echo ;= %%SystemRoot%%\system32\doskey /listsize=1000 /macrofile=%%0%%>>"%aliases%"
-    echo ;= rem In batch mode, jump to the end of the file>>"%aliases%"
-    echo ;= goto:eof>>"%aliases%"
-    echo ;= Add aliases below here>>"%aliases%"
+  if not exist "%ALIASES%" (
+    echo ;= @echo off>"%ALIASES%"
+    echo ;= rem Call DOSKEY and use this file as the macrofile>>"%ALIASES%"
+    echo ;= %%SystemRoot%%\system32\doskey /listsize=1000 /macrofile=%%0%%>>"%ALIASES%"
+    echo ;= rem In batch mode, jump to the end of the file>>"%ALIASES%"
+    echo ;= goto:eof>>"%ALIASES%"
+    echo ;= Add aliases below here>>"%ALIASES%"
  )
 )

 :: 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
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <key name="Software">
 	<key name="ConEmu">
-		<key name=".Vanilla" modified="2015-11-24 14:43:35" build="151119">
+		<key name=".Vanilla" modified="2018-02-22 06:02:11" build="171109">
 			<value name="ColorTable00" type="dword" data="00222827"/>
 			<value name="ColorTable01" type="dword" data="009e5401"/>
 			<value name="ColorTable02" type="dword" data="0004aa74"/>
@ -101,12 +101,12 @@
 			<value name="FontName" type="string" data="Consolas"/>
 			<value name="FontName2" type="string" data="Lucida Console"/>
 			<value name="FontAutoSize" type="hex" data="00"/>
-			<value name="FontSize" type="dword" data="00000010"/>
-			<value name="FontSizeX" type="dword" data="00000000"/>
-			<value name="FontSizeX2" type="dword" data="00000000"/>
-			<value name="FontSizeX3" type="dword" data="00000000"/>
+			<value name="FontSize" type="ulong" data="16"/>
+			<value name="FontSizeX" type="ulong" data="0"/>
+			<value name="FontSizeX2" type="ulong" data="0"/>
+			<value name="FontSizeX3" type="ulong" data="0"/>
 			<value name="FontCharSet" type="hex" data="00"/>
-			<value name="Anti-aliasing" type="dword" data="00000006"/>
+			<value name="Anti-aliasing" type="ulong" data="6"/>
 			<value name="FontBold" type="hex" data="00"/>
 			<value name="FontItalic" type="hex" data="00"/>
 			<value name="Monospace" type="hex" data="01"/>
@ -123,29 +123,29 @@
 			<value name="ColorKeyTransparent" type="hex" data="00"/>
 			<value name="ColorKeyValue" type="dword" data="00010101"/>
 			<value name="UseCurrentSizePos" type="hex" data="01"/>
-			<value name="WindowMode" type="dword" data="0000051f"/>
+			<value name="WindowMode" type="dword" data="00000520"/>
 			<value name="ConWnd Width" type="dword" data="00000078"/>
 			<value name="ConWnd Height" type="dword" data="0000001e"/>
 			<value name="Cascaded" type="hex" data="01"/>
-			<value name="ConWnd X" type="dword" data="000001f4"/>
-			<value name="ConWnd Y" type="dword" data="000001f4"/>
-			<value name="16bit Height" type="dword" data="00000000"/>
+			<value name="ConWnd X" type="long" data="500"/>
+			<value name="ConWnd Y" type="long" data="500"/>
+			<value name="16bit Height" type="ulong" data="0"/>
 			<value name="AutoSaveSizePos" type="hex" data="01"/>
 			<value name="IntegralSize" type="hex" data="00"/>
 			<value name="QuakeStyle" type="hex" data="00"/>
-			<value name="QuakeAnimation" type="dword" data="0000012c"/>
+			<value name="QuakeAnimation" type="ulong" data="300"/>
 			<value name="HideCaption" type="hex" data="00"/>
 			<value name="HideChildCaption" type="hex" data="01"/>
 			<value name="FocusInChildWindows" type="hex" data="01"/>
 			<value name="HideCaptionAlways" type="hex" data="00"/>
 			<value name="HideCaptionAlwaysFrame" type="hex" data="00"/>
-			<value name="HideCaptionAlwaysDelay" type="dword" data="000007d0"/>
-			<value name="HideCaptionAlwaysDisappear" type="dword" data="000007d0"/>
+			<value name="HideCaptionAlwaysDelay" type="ulong" data="2000"/>
+			<value name="HideCaptionAlwaysDisappear" type="ulong" data="2000"/>
 			<value name="DownShowHiddenMessage" type="hex" data="00"/>
 			<value name="ConsoleFontName" type="string" data="Lucida Console"/>
-			<value name="ConsoleFontWidth" type="dword" data="00000003"/>
-			<value name="ConsoleFontHeight" type="dword" data="00000005"/>
-			<value name="DefaultBufferHeight" type="dword" data="000003e8"/>
+			<value name="ConsoleFontWidth" type="long" data="3"/>
+			<value name="ConsoleFontHeight" type="long" data="5"/>
+			<value name="DefaultBufferHeight" type="long" data="1000"/>
 			<value name="AutoBufferHeight" type="hex" data="01"/>
 			<value name="CmdOutputCP" type="dword" data="00000000"/>
 			<value name="ComSpec.Type" type="hex" data="00"/>
@ -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"/>
@ -167,7 +167,7 @@
 			<value name="CTS.MBtnAction" type="hex" data="00"/>
 			<value name="CTS.ColorIndex" type="hex" data="e0"/>
 			<value name="ClipboardConfirmEnter" type="hex" data="01"/>
-			<value name="ClipboardConfirmLonger" type="dword" data="000000c8"/>
+			<value name="ClipboardConfirmLonger" type="ulong" data="200"/>
 			<value name="FarGotoEditorOpt" type="hex" data="01"/>
 			<value name="FarGotoEditorPath" type="string" data="far.exe /e%1:%2 &quot;%3&quot;"/>
 			<value name="FixFarBorders" type="hex" data="01"/>
@ -198,7 +198,7 @@
 			<value name="MouseSkipActivation" type="hex" data="01"/>
 			<value name="MouseSkipMoving" type="hex" data="01"/>
 			<value name="FarHourglass" type="hex" data="01"/>
-			<value name="FarHourglassDelay" type="dword" data="000001f4"/>
+			<value name="FarHourglassDelay" type="ulong" data="500"/>
 			<value name="Dnd" type="hex" data="01"/>
 			<value name="DndDrop" type="hex" data="01"/>
 			<value name="DefCopy" type="hex" data="01"/>
@ -212,8 +212,8 @@
 			<value name="StatusBar.Show" type="hex" data="00"/>
 			<value name="StatusBar.Flags" type="dword" data="00000002"/>
 			<value name="StatusFontFace" type="string" data="Tahoma"/>
-			<value name="StatusFontCharSet" type="dword" data="00000000"/>
-			<value name="StatusFontHeight" type="dword" data="0000000e"/>
+			<value name="StatusFontCharSet" type="ulong" data="0"/>
+			<value name="StatusFontHeight" type="long" data="14"/>
 			<value name="StatusBar.Color.Back" type="dword" data="00404040"/>
 			<value name="StatusBar.Color.Light" type="dword" data="00ffffff"/>
 			<value name="StatusBar.Color.Dark" type="dword" data="00a0a0a0"/>
@ -254,34 +254,34 @@
 			<value name="TabSelf" type="hex" data="01"/>
 			<value name="TabLazy" type="hex" data="01"/>
 			<value name="TabRecent" type="hex" data="00"/>
-			<value name="TabDblClick" type="dword" data="00000001"/>
+			<value name="TabDblClick" type="ulong" data="1"/>
 			<value name="TabsOnTaskBar" type="hex" data="02"/>
 			<value name="TaskBarOverlay" type="hex" data="01"/>
 			<value name="TabCloseMacro" type="string" data=""/>
 			<value name="TabFontFace" type="string" data="Segoe UI"/>
-			<value name="TabFontCharSet" type="dword" data="00000000"/>
-			<value name="TabFontHeight" type="dword" data="00000010"/>
+			<value name="TabFontCharSet" type="ulong" data="0"/>
+			<value name="TabFontHeight" type="long" data="16"/>
 			<value name="SaveAllEditors" type="string" data=""/>
-			<value name="ToolbarAddSpace" type="dword" data="00000000"/>
+			<value name="ToolbarAddSpace" type="long" data="0"/>
 			<value name="TabConsole" type="string" data="     %n     "/>
 			<value name="TabSkipWords" type="string" data="Administrator:|Администратор:"/>
 			<value name="TabPanels" type="string" data="&lt;%c&gt; %s"/>
 			<value name="TabEditor" type="string" data="&lt;%c.%i&gt;{%s}"/>
 			<value name="TabEditorModified" type="string" data="&lt;%c.%i&gt;[%s] *"/>
 			<value name="TabViewer" type="string" data="&lt;%c.%i&gt;[%s]"/>
-			<value name="TabLenMax" type="dword" data="00000014"/>
+			<value name="TabLenMax" type="ulong" data="20"/>
 			<value name="AdminTitleSuffix" type="string" data=" (Admin)"/>
 			<value name="AdminShowShield" type="hex" data="01"/>
 			<value name="HideInactiveConsoleTabs" type="hex" data="00"/>
 			<value name="ShowFarWindows" type="hex" data="01"/>
 			<value name="TryToCenter" type="hex" data="01"/>
-			<value name="CenterConsolePad" type="dword" data="00000008"/>
+			<value name="CenterConsolePad" type="ulong" data="8"/>
 			<value name="ShowScrollbar" type="hex" data="02"/>
-			<value name="ScrollBarAppearDelay" type="dword" data="00000064"/>
-			<value name="ScrollBarDisappearDelay" type="dword" data="000003e8"/>
-			<value name="IconID" type="dword" data="00000001"/>
-			<value name="MainTimerElapse" type="dword" data="0000000a"/>
-			<value name="MainTimerInactiveElapse" type="dword" data="000003e8"/>
+			<value name="ScrollBarAppearDelay" type="ulong" data="100"/>
+			<value name="ScrollBarDisappearDelay" type="ulong" data="1000"/>
+			<value name="IconID" type="ulong" data="1"/>
+			<value name="MainTimerElapse" type="ulong" data="10"/>
+			<value name="MainTimerInactiveElapse" type="ulong" data="1000"/>
 			<value name="AffinityMask" type="dword" data="00000000"/>
 			<value name="SkipFocusEvents" type="hex" data="00"/>
 			<value name="MonitorConsoleLang" type="hex" data="03"/>
@ -297,32 +297,32 @@
 			<value name="FindMatchWholeWords" type="hex" data="00"/>
 			<value name="FindTransparent" type="hex" data="01"/>
 			<value name="PanView.BackColor" type="dword" data="30ffffff"/>
-			<value name="PanView.PFrame" type="dword" data="00000001"/>
+			<value name="PanView.PFrame" type="long" data="1"/>
 			<value name="PanView.PFrameColor" type="dword" data="28808080"/>
-			<value name="PanView.SFrame" type="dword" data="00000001"/>
+			<value name="PanView.SFrame" type="long" data="1"/>
 			<value name="PanView.SFrameColor" type="dword" data="07c0c0c0"/>
-			<value name="PanView.Thumbs.ImgSize" type="dword" data="00000060"/>
-			<value name="PanView.Thumbs.SpaceX1" type="dword" data="00000001"/>
-			<value name="PanView.Thumbs.SpaceY1" type="dword" data="00000001"/>
-			<value name="PanView.Thumbs.SpaceX2" type="dword" data="00000005"/>
-			<value name="PanView.Thumbs.SpaceY2" type="dword" data="00000014"/>
-			<value name="PanView.Thumbs.LabelSpacing" type="dword" data="00000002"/>
-			<value name="PanView.Thumbs.LabelPadding" type="dword" data="00000000"/>
+			<value name="PanView.Thumbs.ImgSize" type="long" data="96"/>
+			<value name="PanView.Thumbs.SpaceX1" type="long" data="1"/>
+			<value name="PanView.Thumbs.SpaceY1" type="long" data="1"/>
+			<value name="PanView.Thumbs.SpaceX2" type="long" data="5"/>
+			<value name="PanView.Thumbs.SpaceY2" type="long" data="20"/>
+			<value name="PanView.Thumbs.LabelSpacing" type="long" data="2"/>
+			<value name="PanView.Thumbs.LabelPadding" type="long" data="0"/>
 			<value name="PanView.Thumbs.FontName" type="string" data="Tahoma"/>
-			<value name="PanView.Thumbs.FontHeight" type="dword" data="0000000e"/>
-			<value name="PanView.Tiles.ImgSize" type="dword" data="00000030"/>
-			<value name="PanView.Tiles.SpaceX1" type="dword" data="00000004"/>
-			<value name="PanView.Tiles.SpaceY1" type="dword" data="00000004"/>
-			<value name="PanView.Tiles.SpaceX2" type="dword" data="000000ac"/>
-			<value name="PanView.Tiles.SpaceY2" type="dword" data="00000004"/>
-			<value name="PanView.Tiles.LabelSpacing" type="dword" data="00000004"/>
-			<value name="PanView.Tiles.LabelPadding" type="dword" data="00000001"/>
+			<value name="PanView.Thumbs.FontHeight" type="long" data="14"/>
+			<value name="PanView.Tiles.ImgSize" type="long" data="48"/>
+			<value name="PanView.Tiles.SpaceX1" type="long" data="4"/>
+			<value name="PanView.Tiles.SpaceY1" type="long" data="4"/>
+			<value name="PanView.Tiles.SpaceX2" type="long" data="172"/>
+			<value name="PanView.Tiles.SpaceY2" type="long" data="4"/>
+			<value name="PanView.Tiles.LabelSpacing" type="long" data="4"/>
+			<value name="PanView.Tiles.LabelPadding" type="long" data="1"/>
 			<value name="PanView.Tiles.FontName" type="string" data="Tahoma"/>
-			<value name="PanView.Tiles.FontHeight" type="dword" data="0000000e"/>
+			<value name="PanView.Tiles.FontHeight" type="long" data="14"/>
 			<value name="PanView.LoadPreviews" type="hex" data="03"/>
 			<value name="PanView.LoadFolders" type="hex" data="01"/>
-			<value name="PanView.LoadTimeout" type="dword" data="0000000f"/>
-			<value name="PanView.MaxZoom" type="dword" data="00000258"/>
+			<value name="PanView.LoadTimeout" type="ulong" data="15"/>
+			<value name="PanView.MaxZoom" type="ulong" data="600"/>
 			<value name="PanView.UsePicView2" type="hex" data="01"/>
 			<value name="PanView.RestoreOnStartup" type="hex" data="00"/>
 			<value name="Update.VerLocation" type="string" data=""/>
@ -483,89 +483,89 @@
 			<value name="DndLKey" type="hex" data="00"/>
 			<value name="DndRKey" type="hex" data="a2"/>
 			<value name="WndDragKey" type="dword" data="00121101"/>
-			<key name="Tasks" modified="2015-11-24 14:43:35" build="151119">
-				<value name="Count" type="dword" data="00000008"/>
-				<key name="Task1" modified="2015-11-24 14:49:10" build="151119">
+			<key name="Tasks" modified="2018-02-22 06:02:12" build="171109">
+				<value name="Count" type="long" data="8"/>
+				<key name="Task1" modified="2018-02-22 06:02:12" build="171109">
 					<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="Active" type="dword" data="00000000"/>
-					<value name="Count" type="dword" data="00000001"/>
+					<value name="Cmd1" type="string" data="*cmd /k &quot;&quot;%ConEmuDir%\..\init.bat&quot; &quot;"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-				<key name="Task2" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task2" modified="2018-02-22 06:05:13" build="171109">
 					<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="Active" type="dword" data="00000000"/>
-					<value name="Count" type="dword" data="00000001"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;&quot;%ConEmuDir%\..\init.bat&quot; &quot;"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-				<key name="Task3" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task3" modified="2018-02-22 06:05:13" build="171109">
 					<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="Active" type="dword" data="00000000"/>
-					<value name="Count" type="dword" data="00000001"/>
+					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-				<key name="Task4" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task4" modified="2018-02-22 06:05:13" build="171109">
 					<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;"/>
 					<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"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
-				<key name="Task5" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task5" modified="2018-02-22 06:05:13" build="171109">
 					<value name="Name" type="string" data="{bash::mintty as Admin}"/>
 					<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="Active" type="dword" data="00000000"/>
-					<value name="Count" type="dword" data="00000001"/>
+					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
 				</key>
-				<key name="Task6" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task6" modified="2018-02-22 06:05:13" build="171109">
 					<value name="Name" type="string" data="{bash::mintty}"/>
 					<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="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="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
+					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l"/>
 				</key>
-				<key name="Task7" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task7" modified="2018-02-22 06:05:13" build="171109">
 					<value name="Name" type="string" data="{bash::bash as Admin}"/>
 					<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="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="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
+					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot;"/>
 				</key>
-				<key name="Task8" modified="2015-11-24 14:49:10" build="151119">
+				<key name="Task8" modified="2018-02-22 06:05:13" build="171109">
 					<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="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;"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
 				</key>
 			</key>

-			<key name="Apps" modified="2015-11-24 14:49:10" build="151119">
-				<value name="Count" type="dword" data="00000000"/>
+			<key name="Apps" modified="2018-02-22 06:05:13" build="171109">
+				<value name="Count" type="long" data="0"/>
 			</key>
-			<key name="Colors" modified="2015-11-24 14:49:10" build="151119">
-				<key name="Palette1" modified="2015-11-24 14:49:10" build="151119">
+			<key name="Colors" modified="2018-02-22 06:05:13" build="171109">
+				<key name="Palette1" modified="2018-02-22 06:05:13" build="171109">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>
@ -606,11 +606,11 @@
 					<value name="ColorTable30" type="dword" data="0000ffff"/>
 					<value name="ColorTable31" type="dword" data="00ffffff"/>
 				</key>
-				<value name="Count" type="dword" data="00000001"/>
+				<value name="Count" type="long" data="1"/>
 			</key>
 			<value name="OneTabPerGroup" type="hex" data="00"/>
 			<value name="ActivateSplitMouseOver" type="hex" data="01"/>
-			<value name="TabBtnDblClick" type="dword" data="00000000"/>
+			<value name="TabBtnDblClick" type="ulong" data="0"/>
 			<value name="ConsoleExceptionHandler" type="hex" data="00"/>
 			<value name="SaveCmdHistory" type="hex" data="00"/>
 			<value name="CTS.IBeam" type="hex" data="01"/>
@ -664,9 +664,9 @@
 			<value name="StatusBar.Hide.WVDC" type="hex" data="01"/>
 			<value name="StatusBar.Hide.Zoom" type="hex" data="01"/>
 			<value name="StatusBar.Hide.Dpi" type="hex" data="01"/>
-			<value name="TabFlashChanged" type="dword" data="00000008"/>
+			<value name="TabFlashChanged" type="long" data="8"/>
 			<value name="TabModifiedSuffix" type="string" data="[*]"/>
-			<key name="HotKeys" modified="2015-11-24 14:43:35" build="151119">
+			<key name="HotKeys" modified="2018-02-22 06:02:12" build="171109">
 				<value name="KeyMacroVersion" type="hex" data="02"/>
 				<value name="Multi.Modifier" type="dword" data="00000011"/>
 				<value name="Multi.ArrowsModifier" type="dword" data="0000005b"/>
@ -847,16 +847,51 @@
 				<value name="Key.DebugProcess" type="dword" data="00105b44"/>
 				<value name="Key.DumpProcess" type="dword" data="00000000"/>
 				<value name="Key.DumpTree" type="dword" data="00000000"/>
+				<value name="Multi.SplitSwap" type="dword" data="00125d58"/>
+				<value name="Multi.SplitSwapU" type="dword" data="00125d26"/>
+				<value name="Multi.SplitSwapD" type="dword" data="00125d28"/>
+				<value name="Multi.SplitSwapL" type="dword" data="00125d25"/>
+				<value name="Multi.SplitSwapR" type="dword" data="00125d27"/>
+				<value name="Multi.GroupInputAll" type="dword" data="00105d47"/>
+				<value name="Multi.GroupInputKey" type="dword" data="00125d47"/>
+				<value name="Key.AltNumpad" type="dword" data="00000000"/>
+				<value name="Key.JumpActiveMonitor" type="dword" data="00000000"/>
+				<value name="Key.BufPrUp" type="dword" data="00121121"/>
+				<value name="Key.BufPrDn" type="dword" data="00121122"/>
+				<value name="Key.ResetTerm" type="dword" data="00000000"/>
 			</key>
-			<value name="StartCreateDelay" type="dword" data="00000064"/>
+			<value name="StartCreateDelay" type="ulong" data="100"/>
 			<value name="DefaultTerminalDebugLog" type="hex" data="00"/>
-			<value name="LastMonitor" type="string" data="0,0,1920,1020"/>
+			<value name="LastMonitor" type="string" data="0,0,1440,1050"/>
 			<value name="Restore2ActiveMon" type="hex" data="00"/>
 			<value name="DownShowExOnTopMessage" type="hex" data="00"/>
-			<value name="EnvironmentSet" type="multi"/>
+			<value name="EnvironmentSet" type="multi">
+				<line data="set PATH=%ConEmuBaseDir%\Scripts;%PATH%"/>
+			</value>
 			<value name="Update.InetTool" type="hex" data="00"/>
 			<value name="Update.InetToolCmd" type="string" data=""/>
 			<value name="SuppressBells" type="hex" data="01"/>
+			<value name="ClipboardAllLinesPosix" type="hex" data="00"/>
+			<value name="ClipboardFirstLinePosix" type="hex" data="00"/>
+			<value name="VividColors" type="hex" data="01"/>
+			<value name="AnsiExecution" type="hex" data="01"/>
+			<value name="AnsiAllowedCommands" type="multi">
+				<line data="cmd -cur_console:R /cGitShowBranch.cmd"/>
+			</value>
+			<value name="KillSshAgent" type="hex" data="01"/>
+			<value name="ProcessCtrlZ" type="hex" data="00"/>
+			<value name="JumpListAutoUpdate" type="hex" data="01"/>
+			<value name="CompressLongStrings" type="hex" data="01"/>
+			<value name="DynamicBufferHeight" type="hex" data="01"/>
+			<value name="CTS.ResetOnRelease" type="hex" data="00"/>
+			<value name="CTS.EraseBeforeReset" type="hex" data="01"/>
+			<value name="Anti-aliasing2" type="hex" data="00"/>
+			<value name="UseAltGrayPlus" type="hex" data="01"/>
+			<value name="MouseDragWindow" type="hex" data="01"/>
+			<value name="DebugLog" type="hex" data="00"/>
+			<value name="StatusBar.Hide.TMode" type="hex" data="01"/>
+			<value name="StatusBar.Hide.RMode" type="hex" data="01"/>
+			<value name="StatusBar.Hide.CellI" type="hex" data="01"/>
 		</key>
 	</key>
 </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>
@ -60,6 +60,9 @@
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -3,7 +3,10 @@
 #include <Shlwapi.h>
 #include "resource.h"
 #include <vector>
+#include <shlobj.h>

+#include <regex> 
+#include <iostream> 

 #pragma comment(lib, "Shlwapi.lib")

@ -54,34 +57,6 @@ typedef struct _option

 typedef std::pair<std::wstring, std::wstring> optpair;

-
-optpair GetOption()
-{
-	wchar_t * cmd = GetCommandLine();
-	int argc;
-	wchar_t ** argv = CommandLineToArgvW(cmd, &argc);
-	optpair pair;
-
-	if (argc == 1)
-	{
-		// no commandline argument...
-		pair = optpair(L"/START", L"");
-	}
-	else if (argc == 2 && argv[1][0] != L'/')
-	{
-		// only a single argument: this should be a path...
-		pair = optpair(L"/START", argv[1]);
-	}
-	else
-	{
-		pair = optpair(argv[1], argc > 2 ? argv[2] : L"");
-	}
-
-	LocalFree(argv);
-
-	return pair;
-}
-
 bool FileExists(const wchar_t * filePath)
 {
 	HANDLE hFile = CreateFile(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
@ -95,7 +70,7 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }

-void StartCmder(std::wstring path, bool is_single_mode)
+void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"")
 {
 #if USE_TASKBAR_API
 	wchar_t appId[MAX_PATH] = { 0 };
@ -106,10 +81,20 @@ void StartCmder(std::wstring path, bool is_single_mode)
 	wchar_t backupCfgPath[MAX_PATH] = { 0 };
 	wchar_t cpuCfgPath[MAX_PATH] = { 0 };
 	wchar_t userCfgPath[MAX_PATH] = { 0 };
-	wchar_t oldCfgPath[MAX_PATH] = { 0 };
+	wchar_t defaultCfgPath[MAX_PATH] = { 0 };
 	wchar_t conEmuPath[MAX_PATH] = { 0 };
+	wchar_t configDirPath[MAX_PATH] = { 0 };
+	wchar_t userConfigDirPath[MAX_PATH] = { 0 };
+	wchar_t userBinDirPath[MAX_PATH] = { 0 };
+	wchar_t userProfiledDirPath[MAX_PATH] = { 0 };
 	wchar_t args[MAX_PATH * 2 + 256] = { 0 };

+	std::wstring cmderStart = path;
+	std::wstring cmderTask = taskName;
+
+	std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
+	userConfigDirPath[cfgRoot.length()] = 0;
+
 	GetModuleFileName(NULL, exeDir, sizeof(exeDir));

 #if USE_TASKBAR_API
@ -120,28 +105,103 @@ void StartCmder(std::wstring path, bool is_single_mode)

 	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");

-	// Check for machine-specific then user config source file.
-	PathCombine(cpuCfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
-	ExpandEnvironmentStrings(cpuCfgPath, cpuCfgPath, sizeof(cpuCfgPath) / sizeof(cpuCfgPath[0]));
-
-	PathCombine(userCfgPath, exeDir, L"config\\user-ConEmu.xml");
- 
-	if (PathFileExists(cpuCfgPath)) {
-		wcsncpy_s(oldCfgPath, cpuCfgPath, sizeof(cpuCfgPath));
-		wcsncpy_s(backupCfgPath, cpuCfgPath, sizeof(cpuCfgPath));
+	PathCombine(configDirPath, exeDir, L"config");
+	if (wcscmp(userConfigDirPath, L"") == 0)
+	{
+		PathCombine(userConfigDirPath, exeDir, L"config");
 	}
-	else if (PathFileExists(userCfgPath)) {
-		wcsncpy_s(oldCfgPath, userCfgPath,sizeof(userCfgPath));
-		wcsncpy_s(backupCfgPath, userCfgPath, sizeof(userCfgPath));
-	}
-	else {
-		PathCombine(oldCfgPath, exeDir, L"config\\ConEmu.xml");
-		wcsncpy_s(backupCfgPath, userCfgPath, sizeof(userCfgPath));
+	else
+	{
+		PathCombine(userBinDirPath, userConfigDirPath, L"bin");
+		SHCreateDirectoryEx(0, userBinDirPath, 0);
+
+		PathCombine(userConfigDirPath, userConfigDirPath, L"config");
+		SHCreateDirectoryEx(0, userConfigDirPath, 0);
+
+		PathCombine(userProfiledDirPath, userConfigDirPath, L"profile.d");
+		SHCreateDirectoryEx(0, userProfiledDirPath, 0);
 	}

 	// Set path to vendored ConEmu config file
 	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");

+	// Set path to Cmder default ConEmu config file
+	PathCombine(defaultCfgPath, exeDir, L"config\\ConEmu.xml");
+
+	// Check for machine-specific then user config source file.
+	PathCombine(cpuCfgPath, userConfigDirPath, L"ConEmu-%COMPUTERNAME%.xml");
+	ExpandEnvironmentStrings(cpuCfgPath, cpuCfgPath, sizeof(cpuCfgPath) / sizeof(cpuCfgPath[0]));
+
+	PathCombine(userCfgPath, userConfigDirPath, L"user-ConEmu.xml");
+
+	if (PathFileExists(cpuCfgPath)) {
+		if (PathFileExists(cfgPath)) {
+			if (!CopyFile(cfgPath, cpuCfgPath, FALSE))
+			{
+				MessageBox(NULL,
+					(GetLastError() == ERROR_ACCESS_DENIED)
+					? L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location! Restart Cmder as administrator."
+					: L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location!", MB_TITLE, MB_ICONSTOP);
+				exit(1);
+			}
+		}
+		else
+		{
+			if (!CopyFile(cpuCfgPath, cfgPath, FALSE))
+			{
+				MessageBox(NULL,
+					(GetLastError() == ERROR_ACCESS_DENIED)
+					? L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location! Restart Cmder as administrator."
+					: L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
+				exit(1);
+			}
+		}
+
+	}
+	else if (PathFileExists(userCfgPath)) {
+		if (PathFileExists(cfgPath)) {
+			if (!CopyFile(cfgPath, userCfgPath, FALSE))
+			{
+				MessageBox(NULL,
+					(GetLastError() == ERROR_ACCESS_DENIED)
+					? L"Failed to copy ConEmu.xml file to backup location! Restart Cmder as administrator."
+					: L"Failed to copy ConEmu.xml file to backup location!", MB_TITLE, MB_ICONSTOP);
+				exit(1);
+			}
+		}
+		else
+		{
+			if (!CopyFile(userCfgPath, cfgPath, FALSE))
+			{
+				MessageBox(NULL,
+					(GetLastError() == ERROR_ACCESS_DENIED)
+					? L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as administrator."
+					: L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
+				exit(1);
+			}
+		}
+	}
+	else if (PathFileExists(cfgPath)) {
+		if (!CopyFile(cfgPath, userCfgPath, FALSE))
+		{
+			MessageBox(NULL,
+				(GetLastError() == ERROR_ACCESS_DENIED)
+				? L"Failed to copy ConEmu.xml file to user-conemu.xml backup location! Restart Cmder as administrator."
+				: L"Failed to copy ConEmu.xml file to user-conemu.xml backup location!", MB_TITLE, MB_ICONSTOP);
+			exit(1);
+		}
+	}
+	else {
+		if (!CopyFile(defaultCfgPath, cfgPath, FALSE))
+		{
+			MessageBox(NULL,
+				(GetLastError() == ERROR_ACCESS_DENIED)
+				? L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as administrator."
+				: L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
+			exit(1);
+		}
+	}
+
 	SYSTEM_INFO sysInfo;
 	GetNativeSystemInfo(&sysInfo);
 	if (sysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
@ -151,46 +211,44 @@ void StartCmder(std::wstring path, bool is_single_mode)
 		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
 	}

-	if (FileExists(oldCfgPath) && !FileExists(cfgPath))
+	if (streqi(cmderStart.c_str(), L""))
 	{
-		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);
-		}
-	}
-	else if (!CopyFile(cfgPath, backupCfgPath, FALSE))
-	{
-		MessageBox(NULL,
-			(GetLastError() == ERROR_ACCESS_DENIED)
-			? L"Failed to backup ConEmu.xml file to ./config folder!"
-			: L"Failed to backup ConEmu.xml file to ./config folder!", MB_TITLE, MB_ICONSTOP);
-		exit(1);
+		TCHAR buff[MAX_PATH];
+		const DWORD ret = GetEnvironmentVariable(L"USERPROFILE", buff, MAX_PATH);
+		cmderStart = buff;
 	}

 	if (is_single_mode)
 	{
-		swprintf_s(args, L"/single /Icon \"%s\" /Title Cmder", icoPath);
+		if (!streqi(cmderTask.c_str(), L"")) {
+			swprintf_s(args, L"%s /single /Icon \"%s\" /Title Cmder /dir \"%s\" /run {%s}", args, icoPath, cmderStart.c_str(), cmderTask.c_str());
+		}
+		else {
+			swprintf_s(args, L"%s /single /Icon \"%s\" /Title Cmder /dir \"%s\"", args, icoPath, cmderStart.c_str());
+		}
 	}
 	else
 	{
-		swprintf_s(args, L"/Icon \"%s\" /Title Cmder", icoPath);
+		if (!streqi(cmderTask.c_str(), L"")) {
+			swprintf_s(args, L"/Icon \"%s\" /Title Cmder /dir \"%s\" /run {%s}", icoPath, cmderStart.c_str(), cmderTask.c_str());
 		}
+		else {
+			swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder /dir \"%s\"", args, icoPath, cmderStart.c_str());
+		}
+	}
+

 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
-	if (!streqi(path.c_str(), L""))
+	if (wcscmp(userConfigDirPath, configDirPath) != 0)
 	{
-		if (!SetEnvironmentVariable(L"CMDER_START", path.c_str())) {
-			MessageBox(NULL, _T("Error trying to set CMDER_START to given path!"), _T("Error"), MB_OK);
-		}
+		SetEnvironmentVariable(L"CMDER_USER_CONFIG", userConfigDirPath);
+		SetEnvironmentVariable(L"CMDER_USER_BIN", userBinDirPath);
 	}
+
 	// Ensure EnvironmentVariables are propagated.

-
 	STARTUPINFO si = { 0 };
+
 	si.cb = sizeof(STARTUPINFO);
 #if USE_TASKBAR_API
 	si.lpTitle = appId;
@ -198,13 +256,12 @@ void StartCmder(std::wstring path, bool is_single_mode)
 #endif
 	PROCESS_INFORMATION pi;
 	if (!CreateProcess(conEmuPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi)) {
-		MessageBox(NULL, _T("Unable to create the ConEmu Process!"), _T("Error"), MB_OK);
+		MessageBox(NULL, _T("Unable to create the ConEmu process!"), _T("Error"), MB_OK);
 		return;
 	}

 	LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL);
 	lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8
-
 }

 bool IsUserOnly(std::wstring opt)
@ -234,8 +291,7 @@ HKEY GetRootKey(std::wstring opt)

 	if (IsUserOnly(opt))
 	{
-		FAIL_ON_ERROR(RegCreateKeyEx(HKEY_CURRENT_USER, L"Software\\Classes", 0, NULL,
-			REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &root, NULL));
+		FAIL_ON_ERROR(RegCreateKeyEx(HKEY_CURRENT_USER, L"Software\\Classes", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &root, NULL));
 	}
 	else
 	{
@ -263,13 +319,10 @@ void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 PathCombine(icoPath, exePath, L"icons\\cmder.ico");

 // Now set the registry keys
-
 HKEY root = GetRootKey(opt);

 HKEY cmderKey;
-	FAIL_ON_ERROR(
-		RegCreateKeyEx(root, keyBaseName, 0, NULL,
-		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
+FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));

 FAIL_ON_ERROR(RegSetValue(cmderKey, L"", REG_SZ, L"Cmder Here", NULL));
 FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"NoWorkingDirectory", 0, REG_SZ, (BYTE *)L"", 2));
@ -277,9 +330,7 @@ void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"Icon", 0, REG_SZ, (BYTE *)icoPath, wcslen(icoPath) * sizeof(wchar_t)));

 HKEY command;
-	FAIL_ON_ERROR(
-		RegCreateKeyEx(cmderKey, L"command", 0, NULL,
-		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &command, NULL));
+FAIL_ON_ERROR(RegCreateKeyEx(cmderKey, L"command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &command, NULL));

 FAIL_ON_ERROR(RegSetValue(command, L"", REG_SZ, commandStr, NULL));

@ -292,9 +343,7 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 {
 	HKEY root = GetRootKey(opt);
 	HKEY cmderKey;
-	FAIL_ON_ERROR(
-		RegCreateKeyEx(root, keyBaseName, 0, NULL,
-		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
+	FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
 #if XP
 	FAIL_ON_ERROR(SHDeleteKey(cmderKey, NULL));
 #else
@ -304,6 +353,106 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 	RegCloseKey(root);
 }

+struct cmderOptions
+{
+	std::wstring cmderCfgRoot = L"";
+	std::wstring cmderStart = L"";
+	std::wstring cmderTask = L"";
+	std::wstring cmderRegScope = L"USER";
+	bool cmderSingle = false;
+	bool registerApp = false;
+	bool unRegisterApp = false;
+	bool error = false;
+
+};
+
+cmderOptions GetOption()
+{
+	cmderOptions cmderOptions;
+	LPWSTR *szArgList;
+	int argCount;
+
+	szArgList = CommandLineToArgvW(GetCommandLine(), &argCount);
+
+	for (int i = 1; i < argCount; i++)
+	{
+		// MessageBox(NULL, szArgList[i], L"Arglist contents", MB_OK);
+
+		if (_wcsicmp(L"/c", szArgList[i]) == 0)
+		{
+			TCHAR userProfile[MAX_PATH];
+			const DWORD ret = GetEnvironmentVariable(L"USERPROFILE", userProfile, MAX_PATH);
+
+			wchar_t cmderCfgRoot[MAX_PATH] = { 0 };
+			PathCombine(cmderCfgRoot, userProfile, L"cmder_cfg");
+
+			cmderOptions.cmderCfgRoot = cmderCfgRoot;
+
+			if (szArgList[i + 1] != NULL && szArgList[i + 1][0] != '/') {
+				cmderOptions.cmderCfgRoot = szArgList[i + 1];
+				i++;
+			}
+		}
+		else if (_wcsicmp(L"/start", szArgList[i]) == 0)
+		{
+			if (PathFileExists(szArgList[i + 1]))
+			{
+				cmderOptions.cmderStart = szArgList[i + 1];
+				i++;
+			}
+			else {
+				MessageBox(NULL, szArgList[i + 1], L"/START - Folder doses not exist!", MB_OK);
+			}
+		}
+		else if (_wcsicmp(L"/task", szArgList[i]) == 0)
+		{
+			cmderOptions.cmderTask = szArgList[i + 1];
+			i++;
+		}
+		else if (_wcsicmp(L"/single", szArgList[i]) == 0)
+		{
+			cmderOptions.cmderSingle = true;
+		}
+		else if (_wcsicmp(L"/register", szArgList[i]) == 0)
+		{
+			cmderOptions.registerApp = true;
+			cmderOptions.unRegisterApp = false;
+			if (szArgList[i + 1] != NULL)
+			{ 
+				if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
+				{
+					cmderOptions.cmderRegScope = szArgList[i + 1];
+					i++;
+				}
+			}
+		}
+		else if (_wcsicmp(L"/unregister", szArgList[i]) == 0)
+		{
+			cmderOptions.unRegisterApp = true;
+			cmderOptions.registerApp = false;
+			if (szArgList[i + 1] != NULL)
+			{
+				if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
+				{
+					cmderOptions.cmderRegScope = szArgList[i + 1];
+					i++;
+				}
+			}
+		}
+		else if (cmderOptions.cmderStart == L"" && PathFileExists(szArgList[i]))
+		{
+			cmderOptions.cmderStart = szArgList[i];
+		}
+		else {
+			MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+			cmderOptions.error = true;
+		}
+	}
+
+	LocalFree(szArgList);
+
+	return cmderOptions;
+}
 int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	_In_opt_ HINSTANCE hPrevInstance,
 	_In_ LPTSTR    lpCmdLine,
@ -313,30 +462,24 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	UNREFERENCED_PARAMETER(lpCmdLine);
 	UNREFERENCED_PARAMETER(nCmdShow);

-	optpair opt = GetOption();
+	cmderOptions cmderOptions = GetOption();

-	if (streqi(opt.first.c_str(), L"/START"))
-	{
-		StartCmder(opt.second, false);
+	if (cmderOptions.registerApp == true ) {
+		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
+		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM);
 	}
-	else if (streqi(opt.first.c_str(), L"/SINGLE"))
+	else if (cmderOptions.unRegisterApp == true )
 	{
-		StartCmder(opt.second, true);
+		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
+		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM);
 	}
-	else if (streqi(opt.first.c_str(), L"/REGISTER"))
+	else if (cmderOptions.error == true)
 	{
-		RegisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
-		RegisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_LISTITEM);
-	}
-	else if (streqi(opt.first.c_str(), L"/UNREGISTER"))
-	{
-		UnregisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
-		UnregisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_LISTITEM);
+		return 1;
 	}
 	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);
-		return 1;
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot);
 	}
 	
 	return 0;
--- a/launcher/src/Resource.rc
+++ b/launcher/src/Resource.rc
--- a/launcher/src/resource.h
+++ b/launcher/src/resource.h
--- 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
@ -54,9 +54,9 @@ function Flatten-Directory ($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"
@ -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
    {
@ -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,6 +3,7 @@
 -- !!! 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
@ -17,7 +18,7 @@ dofile(clink_lua_file)
 -- not destroy our own prompt. It also means that started cmds (or batch files
 -- which echo) don't get the ugly '{lamb}' shown.
 ---
-function set_prompt_filter()
+local function set_prompt_filter()
    -- get_cwd() is differently encoded than the clink.prompt.value, so everything other than
    -- pure ASCII will get garbled. So try to parse the current directory from the original prompt
    -- and only if that doesn't work, use get_cwd() directly.
@ -38,12 +39,11 @@ function set_prompt_filter()
    -- 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 = "λ"
-    else
-        lambda = "("..env..") λ"
+    if env ~= nil then
+        lambda = "("..env..") "..lambda
    end
    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", lambda)
 end
@ -99,10 +99,6 @@ local function get_dir_contains(path, dirname)
    end
 end

-local function get_hg_dir(path)
-    return get_dir_contains(path, '.hg')
-end
-
 -- adapted from from clink-completions' git.lua
 local function get_git_dir(path)

@ -113,12 +109,13 @@ local function get_git_dir(path)
        if i then
            prefix = path:sub(1, i-1)
        end
+
        return prefix
    end

    -- 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)
@ -144,67 +141,20 @@ local function get_git_dir(path)
        or (parent_path ~= path and get_git_dir(parent_path) or nil)
 end

---
- -- Find out current branch
- -- @return {false|mercurial branch name}
---
-function get_hg_branch()
-    for line in io.popen("hg branch 2>nul"):lines() do
-        local m = line:match("(.+)$")
-        if m then
-            return m
-        end
+local function get_hg_dir(path)
+    return get_dir_contains(path, '.hg')
 end

-    return false
-end
-
---
- -- Get the status of working dir
- -- @return {bool}
---
-function get_hg_status()
-    for line in io.popen("hg status -0"):lines() do
-       return false
-    end
-    return true
-end
-
-function hg_prompt_filter()
-
-    -- Colors for mercurial status
-    local colors = {
-        clean = "\x1b[1;37;40m",
-        dirty = "\x1b[31;1m",
-    }
-
-    if get_hg_dir() then
-        -- if we're inside of mercurial repo then try to detect current branch
-        local branch = get_hg_branch()
-        if branch then
-            -- Has branch => therefore it is a mercurial folder, now figure out status
-            if get_hg_status() then
-                color = colors.clean
-            else
-                color = colors.dirty
-            end
-
-            clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", color.."("..branch..")")
-            return false
-        end
-    end
-
-    -- No mercurial present or not in mercurial file
-    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", "")
-    return false
+local function get_svn_dir(path)
+    return get_dir_contains(path, '.svn')
 end

 ---
 -- Find out current branch
 -- @return {nil|git branch name}
 ---
-function get_git_branch(git_dir)
-    local git_dir = git_dir or get_git_dir()
+local function get_git_branch(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
@ -217,24 +167,86 @@ function get_git_branch(git_dir)
    -- 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

+---
+-- Find out current branch
+-- @return {false|mercurial branch name}
+---
+local function get_hg_branch()
+    for line in io.popen("hg branch 2>nul"):lines() do
+        local m = line:match("(.+)$")
+        if m then
+            return m
+        end
+    end
+
+    return false
+end
+
+---
+-- Find out current branch
+-- @return {false|svn branch name}
+---
+local 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
+
 ---
 -- Get the status of working dir
 -- @return {bool}
 ---
-function get_git_status()
-    local file = io.popen("git status --no-lock-index --porcelain 2>nul")
+local function get_git_status()
+    local file = io.popen("git --no-optional-locks status --porcelain 2>nul")
    for line in file:lines() do
        file:close()
        return false
    end
    file:close()
+
    return true
 end

-function git_prompt_filter()
+---
+-- Get the status of working dir
+-- @return {bool}
+---
+local function get_hg_status()
+    local file = io.popen("hg status -0")
+    for line in file:lines() do
+        file:close()
+        return false
+    end
+    file:close()
+
+    return true
+end
+
+---
+-- Get the status of working dir
+-- @return {bool}
+---
+function get_svn_status()
+    local file = io.popen("svn status -q")
+    for line in file:lines() do
+        file:close()
+        return false
+    end
+    file:close()
+
+    return true
+end
+
+local function git_prompt_filter()

    -- Colors for git status
    local colors = {
@ -246,6 +258,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 +277,69 @@ function git_prompt_filter()
    return false
 end

+local function hg_prompt_filter()
+
+    -- Colors for mercurial status
+    local colors = {
+        clean = "\x1b[1;37;40m",
+        dirty = "\x1b[31;1m",
+    }
+
+    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
+                color = colors.clean
+            else
+                color = colors.dirty
+            end
+
+            clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", color.."("..branch..")")
+            return false
+        end
+    end
+
+    -- No mercurial present or not in mercurial file
+    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", "")
+    return false
+end
+
+local 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
@ -279,4 +351,3 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
        dofile(filename)
    end
 end
-
--- a/vendor/cmder.sh
+++ b/vendor/cmder.sh
@ -7,6 +7,20 @@
 # Add system specific users customizations to $HOME/.bashrc, these 
 # customizations will not follow Cmder to another machine.

+function runProfiled {
+  unset profile_d_scripts
+  pushd "${1}" >/dev/null
+  profile_d_scripts=$(ls *.sh 2>/dev/null)
+
+  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+    for x in ${profile_d_scripts} ; do
+      echo Sourcing "${1}/${x}"...
+      . "${1}/${x}"
+    done
+  fi
+  popd >/dev/null
+}
+
 # We do this for bash as admin sessions since $CMDER_ROOT is not being set
 if [ "$CMDER_ROOT" == "" ] ; then
    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
@ -42,24 +56,28 @@ if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
 fi

 if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
-  unset profile_d_scripts
-  pushd "${CMDER_ROOT}/config/profile.d" >/dev/null
-  profile_d_scripts=$(ls *.sh 2>/dev/null)
-
-  if [ ! "x${profile_d_scripts}" = "x" ] ; then
-    for x in ${profile_d_scripts} ; do
-      # echo Sourcing "${CMDER_ROOT}/config/profile.d/${x}"...
-      . "${CMDER_ROOT}/config/profile.d/${x}"
-    done
+  runProfiled  "${CMDER_ROOT}/config/profile.d"
 fi
-  popd >/dev/null
+
+if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
+  runProfiled  "${CMDER_USER_CONFIG}/profile.d"
 fi

 if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
    . "${CMDER_ROOT}/config/user-profile.sh"
+fi
+
+if [ -f "${CMDER_USER_CONFIG}/user-profile.sh" ] ; then
+    . "${CMDER_USER_CONFIG}/user-profile.sh"
 else
-    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
-    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
+    if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+      initialProfile="${CMDER_USER_CONFIG}/user-profile.sh"
+    else
+      initialProfile="${CMDER_ROOT}/config/user-profile.sh"
+    fi
+
+    echo Creating user startup file: "${initialProfile}"
+    cat <<-eof >"${initialProfile}"
 # use this file to run your own startup commands for msys2 bash'

 # To add a new vendor to the path, do something like:
--- a/vendor/cmder_exinit
+++ b/vendor/cmder_exinit
@ -22,6 +22,25 @@
 # # from outside Cmder.
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.

+function runProfiled {
+  unset profile_d_scripts
+  pushd "${1}" >/dev/null
+
+  if [ ! "x${ZSH_VERSION}" = "x"  ]; then
+    profile_d_scripts=$(ls *.zsh 2>/dev/null)
+  elif [ ! "x${BASH_VERSION}" = "x"  ]; then
+    profile_d_scripts=$(ls *.sh 2>/dev/null)
+  fi
+
+  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+    for x in ${profile_d_scripts} ; do
+      echo Sourcing "${1}/${x}"...
+      . "${1}/${x}"
+    done
+  fi
+  popd >/dev/null
+}
+
 # Check that we haven't already been sourced.
 [[ -z ${CMDER_EXINIT} ]] && CMDER_EXINIT="1" || return

@ -55,28 +74,29 @@ if [ ! "$CMDER_ROOT" = "" ] ; then
  fi
  
  if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
-    unset profile_d_scripts
-    pushd "${CMDER_ROOT}/config/profile.d" >/dev/null
-    if [ ! "x${ZSH_VERSION}" = "x"  ]; then
-      profile_d_scripts=$(ls *.zsh 2>/dev/null)
-    elif [ ! "x${BASH_VERSION}" = "x"  ]; then
-      profile_d_scripts=$(ls *.sh 2>/dev/null)
+    runProfiled  "${CMDER_ROOT}/config/profile.d"
  fi
  
-    if [ ! "x${profile_d_scripts}" = "x" ] ; then
-      for x in ${profile_d_scripts} ; do
-        # echo Sourcing "${CMDER_ROOT}/config/profile.d/${x}"...
-        . "${CMDER_ROOT}/config/profile.d/${x}"
-      done
-    fi
-    popd >/dev/null
+  if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
+    runProfiled  "${CMDER_USER_CONFIG}/profile.d"
  fi

+ 
  if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
    . "${CMDER_ROOT}/config/user-profile.sh"
+  fi
+  
+  if [ -f "${CMDER_USER_CONFIG}/user-profile.sh" ] ; then
+      . "${CMDER_USER_CONFIG}/user-profile.sh"
  else
-    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
-    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
+      if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+        initialProfile="${CMDER_USER_CONFIG}/user-profile.sh"
+      else
+        initialProfile="${CMDER_ROOT}/config/user-profile.sh"
+      fi
+  
+      echo Creating user startup file: "${initialProfile}"
+    cat <<-eof >"${initialProfile}"
 # use this file to run your own startup commands for msys2 bash'

 # To add a new vendor to the path, do something like:
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@ -1,6 +1,20 @@
+if test -f /etc/profile.d/git-sdk.sh
+then
+  TITLEPREFIX=SDK-${MSYSTEM#MINGW}
+else
+  TITLEPREFIX=$MSYSTEM
+fi
+
+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"
@ -20,3 +34,6 @@ 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
@ -6,32 +6,112 @@
 :: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 :: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands

-:: Set to > 0 for verbose output to aid in debugging.
-if not defined verbose-output ( set verbose-output=0 )
+:: Use /v command line arg or set to > 0 for verbose output to aid in debugging.
+set verbose-output=0
+set debug-output=0
+set max_depth=1

 :: Find root dir
 if not defined CMDER_ROOT (
-    for /f "delims=" %%i in ("%ConEmuDir%\..\..") do set "CMDER_ROOT=%%~fi"
+    if defined ConEmuDir (
+        for /f "delims=" %%i in ("%ConEmuDir%\..\..") do (
+            set "CMDER_ROOT=%%~fi"
+        )
+    ) else (
+        for /f "delims=" %%i in ("%~dp0\..") do (
+            set "CMDER_ROOT=%%~fi"
+        )
+    )
 )

-:: Remove trailing '\'
+:: Remove trailing '\' from %CMDER_ROOT%
 if "%CMDER_ROOT:~-1%" == "\" SET "CMDER_ROOT=%CMDER_ROOT:~0,-1%"

+:var_loop
+    if "%~1" == "" (
+        goto :start
+    ) else if "%1"=="/v" (
+        set verbose-output=1
+    ) else if "%1"=="/d" (
+        set debug-output=1
+    ) else if "%1" == "/max_depth" (
+        if "%~2" geq "1" if "%~2" leq "5" (
+            set "max_depth=%~2"
+            shift
+        ) else (
+            call :show_error '/max_depth' requires a number between 1 and 5!
+            exit /b
+        )
+    ) else if "%1" == "/c" (
+        if exist "%~2" (
+            if not exist "%~2\bin" mkdir "%~2\bin"
+            set "cmder_user_bin=%~2\bin"
+            if not exist "%~2\config\profile.d" mkdir "%~2\config\profile.d"
+            set "cmder_user_config=%~2\config"
+            shift
+        )
+    ) else if "%1" == "/user_aliases" (
+        if exist "%~2" (
+            set "user-aliases=%~2"
+            shift
+        )
+    ) else if "%1" == "/git_install_root" (
+        if exist "%~2" (
+            set "GIT_INSTALL_ROOT=%~2"
+            shift
+        ) else (
+            call :show_error The Git install root folder "%2", you specified does not exist!
+            exit /b
+        )
+    ) else if "%1" == "/home" (
+        if exist "%~2" (
+            set "HOME=%~2"
+            shift
+        ) else (
+            call :show_error The home folder "%2", you specified does not exist!
+            exit /b
+        )
+    ) else if "%1" == "/svn_ssh" (
+        set SVN_SSH=%2
+        shift
+    )
+    shift
+goto var_loop
+
+:start
+
+call :debug-output init.bat - Env Var - CMDER_ROOT=%CMDER_ROOT%
+call :debug-output init.bat - Env Var - debug-output=%debug-output%
+
+if defined CMDER_USER_CONFIG (
+    call :debug-output init.bat - CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!
+)
+
 :: Pick right version of clink
 if "%PROCESSOR_ARCHITECTURE%"=="x86" (
    set architecture=86
+    set architecture_bits=32
 ) else (
    set architecture=64
+    set architecture_bits=64
 )

 :: Tell the user about the clink config files...
-if not exist "%CMDER_ROOT%\config\settings" (
+if defined "%CMDER_USER_CONFIG%\settings" if not exist "%CMDER_USER_CONFIG%\settings" (
+    echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
+    echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
+
+} else if not exist "%CMDER_ROOT%\config\settings" (
    echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
    echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
 )

 :: Run clink
+if defined CMDER_USER_CONFIG (
+    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
+) else (
    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
+)

 :: Prepare for git-for-windows

@ -43,34 +123,59 @@ if not defined TERM set TERM=cygwin
 :: * if the users points as to a specific git, use that
 :: * test if a git is in path and if yes, use that
 :: * last, use our vendored git
-:: also check that we have a recent enough version of git (e.g. test for GIT\cmd\git.exe)
+:: also check that we have a recent enough version of git by examining the version string
 if defined GIT_INSTALL_ROOT (
    if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" (goto :FOUND_GIT)
 )

-:: check if git is in path...
+:: get the version information for vendored git binary
 setlocal enabledelayedexpansion
-for /F "delims=" %%F in ('where git.exe 2^>nul') do @(
+call :read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
+
+:: check if git is in path...
+for /F "delims=" %%F in ('where git.exe 2^>nul') do (
+    :: get the absolute path to the user provided git binary
    pushd %%~dpF
-    cd ..
    set "test_dir=!CD!"
    popd
-    if exist "!test_dir!\cmd\git.exe" (
+
+    :: get the version information for the user provided git binary
+    call :read_version USER "!test_dir!"
+
+    if !errorlevel! geq 0 (
+        :: compare the user git version against the vendored version
+        call :compare_versions USER VENDORED
+
+        :: use the user provided git if its version is greater than, or equal to the vendored git
+        if !errorlevel! geq 0 if exist "!test_dir:~0,-4!\cmd\git.exe" (
+            set "GIT_INSTALL_ROOT=!test_dir:~0,-4!"
+            set test_dir=
+            goto :FOUND_GIT
+        ) else if !errorlevel! geq 0 (
            set "GIT_INSTALL_ROOT=!test_dir!"
            set test_dir=
            goto :FOUND_GIT
        ) else (
-        echo Found old git version in "!test_dir!", but not using...
+            call :verbose-output Found old !GIT_VERSION_USER! in "!test_dir!", but not using...
            set test_dir=
        )
+    ) else (
+
+        :: if the user provided git executable is not found
+        if !errorlevel! equ -255 (
+            call :verbose-output No git at "!git_executable!" found.
+            set test_dir=
+        )
+
+    )
+
 )

 :: our last hope: our own git...
 :VENDORED_GIT
 if exist "%CMDER_ROOT%\vendor\git-for-windows" (
    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
-    call :verbose-output Add the minimal git commands to the front of the path
-    set "PATH=!GIT_INSTALL_ROOT!\cmd;%PATH%"
+    call :enhance_path "!GIT_INSTALL_ROOT!\cmd" 
 ) else (
    goto :NO_GIT
 )
@ -79,38 +184,48 @@ if exist "%CMDER_ROOT%\vendor\git-for-windows" (
 :: Add git to the path
 if defined GIT_INSTALL_ROOT (
    rem add the unix commands at the end to not shadow windows commands like more
-    call :verbose-output Enhancing PATH with unix commands from git in "%GIT_INSTALL_ROOT%\usr\bin"
-    set "PATH=%PATH%;%GIT_INSTALL_ROOT%\usr\bin;%GIT_INSTALL_ROOT%\usr\share\vim\vim74"
+    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" call :enhance_path "!GIT_INSTALL_ROOT!\cmd" append
+    if exist "!GIT_INSTALL_ROOT!\mingw32" (
+        call :enhance_path "!GIT_INSTALL_ROOT!\mingw32" append
+    ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
+        call :enhance_path "!GIT_INSTALL_ROOT!\mingw64" append
+    )
+    if exist "!GIT_INSTALL_ROOT!\usr\bin" call :enhance_path "%GIT_INSTALL_ROOT%\usr\bin" append
    :: 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"
 )

 :NO_GIT
 endlocal & set "PATH=%PATH%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
+call :debug-output init.bat - Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%

 :: Enhance Path
-set "PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\"
+call :enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
+if defined CMDER_USER_BIN (
+  call :enhance_path "%CMDER_USER_BIN%" %max_depth%
+)
+call :enhance_path "%CMDER_ROOT%" append

 :: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d"
 :: to run them at startup.
-if not exist "%CMDER_ROOT%\config\profile.d" (
-  mkdir "%CMDER_ROOT%\config\profile.d"
+call :run_profile_d "%CMDER_ROOT%\config\profile.d"
+if defined CMDER_USER_CONFIG (
+  call :run_profile_d "%CMDER_USER_CONFIG%\profile.d"
 )

-pushd "%CMDER_ROOT%\config\profile.d"
-for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
-  call :verbose-output Calling "%CMDER_ROOT%\config\profile.d\%%x"...
-  call "%CMDER_ROOT%\config\profile.d\%%x"
-)
-popd
-
 :: Allows user to override default aliases store using profile.d
 :: scripts run above by setting the 'aliases' env variable.
 ::
 :: Note: If overriding default aliases store file the aliases
 :: must also be self executing, see '.\user-aliases.cmd.example',
 :: and be in profile.d folder.
+if not defined user-aliases (
+  if defined CMDER_USER_CONFIG (
+     set "user-aliases=%CMDER_USER_CONFIG%\user-aliases.cmd"
+  ) else (
     set "user-aliases=%CMDER_ROOT%\config\user-aliases.cmd"
+  )
+)

 :: The aliases environment variable is used by alias.bat to id
 :: the default file to store new aliases in.
@ -127,8 +242,13 @@ if not exist "%user-aliases%" (
    type "%user-aliases%" | findstr /i ";= Add aliases below here" >nul
    if "!errorlevel!" == "1" (
        echo Creating initial user-aliases store in "%user-aliases%"...
-        copy "%CMDER_ROOT%\%user-aliases%" "%user-aliases%.old_format" 
+        if defined CMDER_USER_CONFIG (
+            copy "%user-aliases%" "%user-aliases%.old_format"
            copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
+        ) else (
+            copy "%user-aliases%" "%user-aliases%.old_format"
+            copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
+        )
    )
 )

@ -141,42 +261,56 @@ if exist "%CMDER_ROOT%\config\aliases" (
  type "%user-aliases%.old_format" >> "%user-aliases%" && del "%user-aliases%.old_format"
 )
 endlocal
+
 :: Add aliases to the environment
 call "%user-aliases%"

 :: See vendor\git-for-windows\README.portable for why we do this
 :: Basically we need to execute this post-install.bat because we are
 :: manually extracting the archive rather than executing the 7z sfx
-if exist "%CMDER_ROOT%\vendor\git-for-windows\post-install.bat" (
+if exist "%GIT_INSTALL_ROOT%\post-install.bat" (
    call :verbose-output Running Git for Windows one time Post Install....
-    cd /d "%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 "%GIT_INSTALL_ROOT%\"
+    "%GIT_INSTALL_ROOT%\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat
+    popd
 )

 :: Set home path
 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%"
-)
-
+call :debug-output init.bat - Env Var - HOME=%HOME%

 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"
+)
+
+if defined CMDER_USER_CONFIG if exist "%CMDER_USER_CONFIG%\user-profile.cmd" (
+    REM Create this file and place your own command in there
+    call "%CMDER_USER_CONFIG%\user-profile.cmd"
 ) else (
    echo Creating user startup file: "%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"
+echo @echo off
+) >"%temp%\user-profile.tmp"
+
+  if defined CMDER_USER_CONFIG (
+    copy "%temp%\user-profile.tmp" "%CMDER_USER_CONFIG%\user-profile.cmd"
+  ) else (
+    copy "%temp%\user-profile.tmp" "%CMDER_ROOT%\config\user-profile.cmd"
+  )
 )

 exit /b
@ -184,6 +318,229 @@ exit /b
 ::
 :: sub-routines below here
 ::
-:verbose-output
-    if %verbose-output% gtr 0 echo %*
+:debug-output
+    if %debug-output% gtr 0 echo %* & echo.
+    exit /b
+
+:verbose-output
+    if %debug-output% gtr 0 (
+      call :debug-output :verbose-output - %*
+    ) else if %verbose-output% gtr 0 (
+      echo %*
+    )
+    exit /b
+
+:show_error
+    echo ERROR: %*
+    echo CMDER Shell Initialization has Failed!
+    exit /b
+
+:run_profile_d
+  if not exist "%~1" (
+    mkdir "%~1"
+  )
+  
+  pushd "%~1"
+  for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
+    call :verbose-output Calling "%~1\%%x"...
+    call "%~1\%%x"
+  )
+  popd
+  exit /b
+
+::
+:: specific to git version comparing
+::
+:read_version
+    :: clear the variables
+    set GIT_VERSION_%~1=
+
+    :: set the executable path
+    set "git_executable=%~2\git.exe"
+    call :debug-output :read_version - Env Var - git_executable=%git_executable%
+
+    :: check if the executable actually exists
+    if not exist "%git_executable%" (
+        call :verbose-output "%git_executable%" does not exist!
+        exit /b -255
+    )
+
+    :: get the git version in the provided directory
+    for /F "tokens=1,2,3 usebackq" %%F in (`"%git_executable%" --version 2^>nul`) do (
+        if "%%F %%G" == "git version" (
+            set "GIT_VERSION_%~1=%%H"
+            call :debug-output :read_version - Env Var - GIT_VERSION_%~1=%%H
+        ) else (
+            echo "git --version" returned an inproper version string!
+            pause
+            exit /b
+        )
+    )
+
+    :: parse the returned string
+    call :debug-output :read_version - Calling - :validate_version "%~1" !GIT_VERSION_%~1!
+    call :validate_version "%~1" !GIT_VERSION_%~1!
+    exit /b
+
+:parse_version
+    :: process a `x.x.x.xxxx.x` formatted string
+    for /F "tokens=1-3* delims=.,-" %%A in ("%2") do (
+        set "%~1_MAJOR=%%A"
+        set "%~1_MINOR=%%B"
+        set "%~1_PATCH=%%C"
+        set "%~1_BUILD=%%D"
+    )
+    exit /b
+
+:validate_version
+    :: now parse the version information into the corresponding variables
+    call :parse_version %~1 %~2
+
+    :: ... and maybe display it, for debugging purposes.
+    call :debug-output :validate_version - Found Git Version for %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
+    exit /b
+
+:compare_versions
+    :: checks all major, minor, patch and build variables for the given arguments.
+    :: whichever binary that has the most recent version will be used based on the return code.
+
+    :: call :debug-output Comparing:
+    :: call :debug-output %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
+    :: call :debug-output %~2: !%~2_MAJOR!.!%~2_MINOR!.!%~2_PATCH!.!%~2_BUILD!
+
+    if !%~1_MAJOR! GTR !%~2_MAJOR! (exit /b  1)
+    if !%~1_MAJOR! LSS !%~2_MAJOR! (exit /b -1)
+
+    if !%~1_MINOR! GTR !%~2_MINOR! (exit /b  1)
+    if !%~1_MINOR! LSS !%~2_MINOR! (exit /b -1)
+
+    if !%~1_PATCH! GTR !%~2_PATCH! (exit /b  1)
+    if !%~1_PATCH! LSS !%~2_PATCH! (exit /b -1)
+
+    if !%~1_BUILD! GTR !%~2_BUILD! (exit /b  1)
+    if !%~1_BUILD! LSS !%~2_BUILD! (exit /b -1)
+
+    :: looks like we have the same versions.
+    exit /b 0
+
+:enhance_path
+    setlocal enabledelayedexpansion
+    if "%~1" neq "" (
+        if exist "%~1" (
+            set "add_path=%~1"
+        ) else (
+            call :show_error :enhance_path - The path specified. "%~1", does not exist!
+            exit 1
+        )
+    ) else (
+        call :show_error You must specify a directory to add to the path!
+        exit 1
+    )
+    
+    if "%~2" neq "" if /i "%~2" == "append" (
+        set "position=%~2"
+    ) else (
+        set "position="
+    )
+
+    set "find_query=%add_path%"
+    set "find_query=%find_query:\=\\%"
+    set "find_query=%find_query: =\ %"
+    set found=0
+
+    call :debug-output  :enhance_path "Env Var - find_query=%find_query%"
+    echo "%PATH%"|findstr >nul /I /R ";%find_query%\"$"
+    if "!ERRORLEVEL!" == "0" set found=1
+
+    call :debug-output  :enhance_path "Env Var 1 - found=!found!"
+    if "!found!" == "0" (
+        echo "%PATH%"|findstr >nul /i /r ";%find_query%;"
+        if "!ERRORLEVEL!" == "0" set found=1
+        call :debug-output  :enhance_path "Env Var 2 - found=!found!"
+    )
+
+    if "%found%" == "0" (
+        call :debug-output :enhance_path "BEFORE Env Var - PATH=!path!"
+        if /i "%position%" == "append" (
+            call :debug-output :enhance_path "Appending '%add_path%'"
+            set "PATH=%PATH%;%add_path%"
+        ) else (
+            call :debug-output :enhance_path "Prepending '%add_path%'"
+            set "PATH=%add_path%;%PATH%"
+        )
+
+        call :debug-output  :enhance_path "AFTER Env Var - PATH=!path!"
+    )
+
+    endlocal & set "PATH=%PATH%"
+    exit /b
+
+:enhance_path_recursive
+::: ==============================================================================
+:::enhance_path_recursive - Add a directory and subs to the path env variable if
+:::                         required.
+::: 
+:::include: 
+::: 
+:::  call "$0"
+:::
+:::usage: 
+::: 
+:::  call "%~DP0lib_path" enhance_path_recursive "[dir_path]" [max_depth] [append]
+::: 
+:::required: 
+::: 
+:::  [dir_path] <in> Fully qualified directory path. Ex: "c:\bin"
+::: 
+:::dptions: 
+::: 
+:::  [max_depth] <in> Max recuse depth.  Default: 1
+:::
+:::  append      <in> Append instead rather than pre-pend "[dir_path]"
+::: 
+:::output:
+::: 
+:::  path       <out> Sets the path env variable if required. 
+::: ------------------------------------------------------------------------------
+
+    setlocal enabledelayedexpansion
+    if "%~1" neq "" (
+        set "add_path=%~1"
+    ) else (
+        call :directory to add to the path!"
+        exit 1
+    )
+    
+    if "%~2" gtr "1" (
+        set "max_depth=%~2"
+    ) else (
+        set "max_depth=1"
+    )
+
+    if "%~3" neq "" if /i "%~3" == "append" (
+        set "position=%~3"
+    ) else (
+        set "position="
+    )
+
+    if "%depth%" == "" set depth=0
+
+    call :debug-output  :enhance_path_recursive "Env Var - add_path=%add_path%"
+    call :debug-output  :enhance_path_recursive "Env Var - position=%position%"
+    call :debug-output  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
+
+    if %max_depth% gtr !depth! (
+        call :debug-output :enhance_path_recursive "Adding parent directory - '%add_path%'"
+        call :enhance_path "%add_path%" %position%
+        set /a "depth=!depth!+1"
+
+        for /d %%i in ("%add_path%\*") do (
+            call :debug-output  :enhance_path_recursive "Env Var BEFORE - depth=!depth!"
+            call :debug-output :enhance_path_recursive "Found Subdirectory - '%%~fi'"
+            call :enhance_path_recursive "%%~fi" %max_depth% %position%
+            call :debug-output  :enhance_path_recursive "Env Var AFTER- depth=!depth!"
+        )
+    )
+
+    endlocal & set "PATH=%PATH%"
    exit /b
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@ -4,23 +4,39 @@
 # !!! 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
 }

+if ($ENV:CMDER_USER_CONFIG) {
+    # write-host "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
+}
+
+# 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)
+
+# 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;")
 }

@ -72,13 +88,6 @@ function checkGit($Path) {
    }
 }

-# Move to the wanted location
-# 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 ( $ENV:CMDER_START ) {
-    Set-Location -Path "$ENV:CMDER_START"
-}
-
 if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
    Set-PSReadlineOption -ExtraPromptLineCount 1
 }
@ -86,19 +95,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,10 +109,61 @@ 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
+
+# Drop *.ps1 files into "$ENV:CMDER_USER_CONFIG\config\profile.d"
+# to source them at startup.  Requires using cmder.exe /C [cmder_user_root_path] argument
+if ($ENV:CMDER_USER_CONFIG -ne "" -and -not (test-path "$ENV:CMDER_USER_CONFIG\profile.d")) {
+    pushd $ENV:CMDER_USER_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.
    . "$CmderUserProfilePath"
+
+}
+
+if ($ENV:CMDER_USER_CONFIG) {
+    $CmderUserProfilePath = Join-Path $ENV:CMDER_USER_CONFIG "user-profile.ps1"
+}
+
+if (Test-Path $CmderUserProfilePath) {
+    . "$CmderUserProfilePath"
 } else {
 # This multiline string cannot be indented, for this reason I've not indented the whole block

@ -160,22 +207,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.16.2.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/PortableGit-2.16.2-64-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/mridgers/clink/releases/download/0.4.9/clink_0.4.9.zip"
    },
    {
        "name": "conemu-maximus5",
-        "version": "161022",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v16.10.22/ConEmuPack.161022.7z"
+        "version": "180206",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.02.06/ConEmuPack.180206.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
Dax T Games	b37001b591	Update CHANGELOG.md Update Changelog Tag url after merge	2018-03-13 18:18:46 -05:00
Dax T Games	997e799138	New cmder.exe args and shared install capability (#1696 ) @MartiUK: Squashing to avoid adding multiple "fixed" commits * add args to init.bat * adding args to cmder launcher * reworked command line parsing and added a /C [path] arg for individual user config location * removed unnecessary includes * make shell init scripts work with CMDER_USER_CONFIG * update tasks and readme.md * fix git version check * readme updates * add register/unregister back in * fixed git version again * removed error if user defines user-aliases store file was not present an init.bat launch * added enhance_path method to only update path if required * added enhance_path method to only update path if required * fixed a path prepend issue in enhance path * init.bat with args is executed outside cmder/conemu sets cmder_root properly. Thanks @DRSDavidSoft * fixed enhance path append issue * implements recursive `/bin` path enhancing. https://github.com/cmderdev/cmder/issues/1624 * added max depth * changes command line arg to max_depth * set max_depth default * readme.md updates * add back cmder /c [path] arg so it can be used with admin sessions since the env is not shared. * readme.md updates * fix /c setting of cmder_user_config * changelog and readme * remove bad arg * fixed command line parsing and updated command line help on error * Fixed ConEmu.xml file handling so it works again * Added default user config root location if '/c' is specified and next arg is not another arg	2018-03-13 16:38:27 +01:00
David Refoua	ff2e09849e	simplified λ prompt in lua (#1693 ) * replace lambda with $ * simplified $ prompt The $ character for the prompt is defined only once instead of twice * fixed λ prompt	2018-03-08 12:01:48 +01:00
David Refoua	8237b1010c	Detect and compare installed Git version against vendored Git (#1658 ) * Replaced the git version comparison mechanism with actual version comparing * Add notes regarding the git comparison method Added a simple mechanism to call and compare the user installed git version against the vendored git version, rather than checking if the `git.exe` executable is located in a `/bin` directory. This fixes false warnings by actually testing if the user installed git is older, or more recent. Added a small note regarding how the `init.bat` works, and where to put custom `git.exe` binaries as well as where to find the Minified Cmder.	2018-02-22 19:20:08 +00:00
Benjamin Staneck	cf311fb1c2	⬆️ Update Git to 2.16.2 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.16.2.windows.1	2018-02-20 20:20:23 +01:00
precla	78b9c97fa9	Updated Changelog.md	2018-02-19 22:55:46 +01:00
Benjamin Staneck	a49c1b3f3d	⬆️ ConEmu to 180206 release notes: https://conemu.github.io/blog/2018/02/06/Build-180206.html	2018-02-11 18:09:47 +01:00
Benjamin Staneck	fff6e4506c	⬆️ Update Git to 2.16.1(4) Release notes: https://github.com/git-for-windows/git/releases/tag/v2.16.1.windows.4	2018-02-11 18:07:40 +01:00
Benjamin Staneck	a71c6a50ad	always close open file handles Fixes #1619	2018-01-16 21:59:11 +01:00
Benjamin Staneck	5e703796c9	git should no longer require extra file closing after the recent changes	2018-01-09 14:52:48 +01:00
Benjamin Staneck	b88a01822f	re-order git/hg/svn functions	2018-01-09 14:52:48 +01:00
Varriount	3bf07c088d	Fix alias.bat handling "user-aliases.cmd" with spaces (#1531 ) * Fix alias.bat handling "user-aliases.cmd" with spaces This fixes the alias command when user-aliases.cmd is located in a path with spaces (like when Cmder is installed into the program-files directory). I've also made the alphabetical case of the ALIASES variable consistent. * address review comments	2018-01-09 14:52:22 +01:00
Benjamin Staneck	724930d69d	cleanup on isle 5	2018-01-09 14:50:46 +01:00
David Driscoll	badb027c24	use /dir Switch instead of CMDER_START	2018-01-09 14:50:46 +01:00
Benjamin Staneck	145a1b144b	Fix for the last	2018-01-06 23:52:24 +01:00
Benjamin Staneck	29c5e83975	Replace --no-lock-index with the new --no-optional-locks	2018-01-06 23:43:50 +01:00
Benjamin Staneck	1c02c55c2f	⬆️ ConEmu to 171226 release notes: https://conemu.github.io/blog/2017/12/26/Build-171226.html	2017-12-28 14:21:28 +01:00
Benjamin Staneck	74fc14eadf	⬆️ ConEmu to 171217 release notes: https://conemu.github.io/blog/2017/12/17/Build-171217.html	2017-12-22 17:23:56 +01:00
Benjamin Staneck	0729c06c20	switch back to the official version of clink	2017-12-22 17:23:56 +01:00
Dax T. Games	6da96fb7ec	add config/settings to .gitignore	2017-12-16 23:38:11 +01:00
Dax T. Games	ba610f5f7b	fixes	2017-12-15 22:37:08 +01:00
Dax T. Games	7930c9bfe5	Add upgrade steps to README.md	2017-12-15 22:37:08 +01:00
Benjamin Staneck	bafaf7cba4	oops, fix download url	2017-11-30 10:13:25 +01:00
Benjamin Staneck	3c14d19a27	⬆️ Update Git to v2.15.1(2) Release notes: https://github.com/git-for-windows/git/releases/tag/v2.15.1.windows.2	2017-11-30 10:05:46 +01:00
Benjamin Staneck	13941a44ec	⬆️ Update Git to v2.15.1 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.15.1.windows.1	2017-11-29 23:54:39 +01:00
Martin Kemp	ee4f85de85	Merge pull request #1416 from gucong3000/patch-1 Compatible with Visual Studio Code (cmd)	2017-11-29 13:43:13 +01:00
Tony Lin	9d6e5c12a2	Fix startup folder issue	2017-11-13 19:33:03 +01:00
Benjamin Staneck	da27f9be9f	⬆️ ConEmu to 171109 release notes: https://conemu.github.io/blog/2017/11/09/Build-171109.html	2017-11-12 00:35:42 +01:00
Benjamin Staneck	124565f36a	switch to the 64bit version of Git for Windows	2017-11-03 15:06:27 +01:00
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
刘祺	25005930ba	Compatible with Visual Studio Code	2017-06-23 17:48:03 +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