Merge pull request #2449 from daxgames/alias_fix

Alias fix
CHANGELOG.md
2025-07-17 04:59:09 +08:00 · 2020-12-23 07:55:52 -05:00 · 2020-12-23 07:55:16 -05:00 · 2020-12-23 07:33:12 -05:00 · 2020-12-23 07:30:47 -05:00 · 2020-12-23 07:29:36 -05:00
28 changed files with 926 additions and 345 deletions
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@ -84,7 +84,10 @@
 <!--
  Some tips on how to write a better report:
  - Put an `x` into all the boxes [ ] relevant to your issue (correct example: [x] -- not like this: [ x] or [x ]).
+  - Any text that is between the the commment tags will get ignored, e.g.: <!-- this will NOT work -- >
+    You need to write your text either outside the tags, or the line below it.
  - Use the *Preview* tab to see how your issue will actually look like, before sending it.
+    ⚠ If for some reason you can not see the text you just wrote, make sure you've read the instructions clearly
  - Make sure the description is worded well enough to be understood, and with as much context and examples as possible.
  - Post a screenshot or the command the triggered the problem, if applicable.
  - Avoid using ambiguous phrases like: doesn't work, there'a problem, etc.
@ -93,6 +96,7 @@
    We can't process your issue if it's written in Russian or Chinese as we can't understand them.
  - You can find the version of Cmder.exe and ConEmu.exe binaries using Right Click → Properties → Details menu.
  - ⚠ Read the following page to avoid posting a bad issue: https://conemu.github.io/en/BadIssue.html
+  - Failure to follow these guidelines may result in your issue getting closed. So please follow it carefully!
 -->

 ### Purpose of the issue
@ -101,9 +105,9 @@
 - [ ] Question

 ### Version Information
-<!-- Please write your Cmder and ConEmu version here -->
+<!-- Please write your Cmder and ConEmu version below this line -->

-<!-- If applicable, write down your Windows edition too (e.g. Windows 10 Pro 1809) -->
+<!-- If applicable, write down your Windows edition too below this line (e.g. Windows 10 Pro 1903) -->

 ### Description of the issue
-<!-- Provide a clear, simple description of your issue here -->
+<!-- Provide a clear, simple description of your issue below this line -->
--- a/.gitignore
+++ b/.gitignore
@ -3,12 +3,14 @@

 bin/*
 !bin/Readme.md
+opt/*
+!opt/Readme.md

 vendor/*/*
 !vendor/bin/*
 !vendor/lib/*
 !vendor/*
-!vendor/psmodules/PsGet
+!vendor/psmodules/*

 config/*
 !config/Readme.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,90 @@
 # Change Log

-## [1.3.12](https://github.com/cmderdev/cmder/tree/v1.3.12) (2019-08-18)
+## [1.3.17](https://github.com/cmderdev/cmder/tree/v1.3.17) (2020-12-23)
+
+### Fixes
+
+- [bug] Running `alias ..=cd ..` removes other aliases #2394
+- Switch to @chrisant996 [Clink](https://github.com/chrisant996/clink/) v1.1.10 to fix Clink newer Windows 10 releases.
+- Fix `\Git\cmd\git.exe found. was unexpected at this time.`
+- Documentation fixes.
+
+### Changes
+
+- Update Git to 2.29.0
+- Improve `init.bat` Speed
+- Add `systeminfo.exe` output to iag scripts.
+
+## [1.3.16](https://github.com/cmderdev/cmder/tree/v1.3.16) (2020-07-29)
+
+### Fixes
+
+* Merge pull request #2357 from FloSchwalm/fix-git-version-comparison  [Dax T Games]                                                                   
+* Merge pull request #2339 from daxgames/fix_global_vars_vscode_err  [Dax T Games]                                                                     
+
+### Changes
+
+* Merge pull request #2358 from FloSchwalm/update-to-git-2.28  [Dax T Games]               
+                                                                                                                                                                          
+## [1.3.15](https://github.com/cmderdev/cmder/tree/v1.3.15) (2020-06-26)
+
+* Fixes #2247, fixes #2254 [#2265](https://github.com/cmderdev/cmder/pull/2265)
+* Clink path get broken if clink-completions content is created in a different order #2278Clink path get broken if clink-completions content is created in a different order [#2278](https://github.com/cmderdev/cmder/pull/2278)
+* Move Git functions to `lib/git.bat` [#2293](https://github.com/cmderdev/cmder/pull/2293)
+* Fix Cmder issue #2290 [#2294](https://github.com/cmderdev/cmder/pull/2294)
+* Update git for windows to 2.26.2 [#2308](https://github.com/cmderdev/cmder/pull/2308)
+* Update README.md #2323Update README.md [#2323](https://github.com/cmderdev/cmder/pull/2323)
+* Added support for setting custom icons for Cmder window [#2335](https://github.com/cmderdev/cmder/pull/2335)
+* Fix and enhance enhance_path_recursive [#2311](https://github.com/cmderdev/cmder/pull/2311)
+
+## [1.3.14](https://github.com/cmderdev/cmder/tree/v1.3.14) (2020-01-08)
+
+### Fixes
+
+* Pull Request: [#2222](https://github.com/cmderdev/cmder/pull/2222)
+  * Cmder v1.3.13 init script fails. [#2218](https://github.com/cmderdev/cmder/issues/2218)
+  * Git & env related error messages. [#2220](https://github.com/cmderdev/cmder/issues/2220)
+  * Latest addition of "--nolog" clink breaks cmd prompts. [#2166](https://github.com/cmderdev/cmder/issues/2166)
+  * `/nix_tools 0` should prevent adding `%GIT_INSTALL_ROOT%\mingw64\bin` to PATH. [#2214](https://github.com/cmderdev/cmder/issues/2214)
+
+### Changes
+
+* Update Git for Windows to 2.24.1.windows.2
+  * Pull Request: [#2237](https://github.com/cmderdev/cmder/pull/2237)
+* Update clink-completions to 0.3.5
+  * Pull Request: [#2223](https://github.com/cmderdev/cmder/pull/2223)
+
+## [1.3.13](https://github.com/cmderdev/cmder/tree/v1.3.13) (2019-11-03)
+
+### Changes
+
+* Update to Conemu 19.10.12
+
+### Adds
+
+* #2197, #1364, #447 Add ability to disable git status either globally or for individual repos.
+  * To disable git status globally add the following to `~/.gitconfig` or locally for a single repo `[repo]/.git/config`:
+
+    ```
+    [cmder]
+      status = false
+    ```
+
+* #2174 `--` Syntax to pass command line options to Conemu.
+* Disable Clink Logging
+* Add `~` tab completion.
+
+
+### Fixes
+
+* Fix #2191: profile.ps1: CheckGit does not export $gitLoaded
+* Fix #2192: Set default prompt hooks before loading user profile
+* Fix #2097, #1899: powershell foreground color changing to green
+* Fix #1979: Update Clink Completions to 0.3.4
+* Fix #1678: Cmder corrupting path with `!` in Cmder folder path.
+
+
+## [1.3.12](https://github.com/cmderdev/cmder/tree/v1.3.12) (2019-08-19)

 ### Fixes

@ -33,6 +117,11 @@
    * Syntax: `/x [ConEmu extras arguments]`
    *   e.g.: `Cmder.exe /x "-min -tsa"`

+* Pull Request: [#2072](https://github.com/cmderdev/cmder/pull/2072)
+  * New alias create [alias] [alias command] syntax
+    * Based on [#1750](https://github.com/cmderdev/cmder/pull/1750)
+    * Syntax: `alias create [alias] [alias command]`
+
 ## [1.3.11](https://github.com/cmderdev/cmder/tree/v1.3.11) (2018-12-22)

 ### Fixes
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -7,7 +7,7 @@ If you follow them your contribution will likely be pulled in quicker.
 ## Getting Started

 * Fork the repository on GitHub (It's that easy)
-* Create a feature branch based on the development branch.
+* Create a feature branch based on the `master` branch.

 ## Making Changes

--- a/README.md
+++ b/README.md
@ -23,19 +23,29 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 ### 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`
+3. (optional) Place your own executable files and custom app folders into the `%cmder_root%\bin`. See: [bin/README.md](./bin/Readme.md)
+   - This folder to be injected into your PATH by default.
+   - See `/max_depth [1-5]` in 'Command Line Arguments for `init.bat`' table to add subdirectories recursively.
+4. (optional) Place your own custom app folders into the `%cmder_root%\opt`. See: [opt/README.md](./opt/Readme.md)
+   - This folder will NOT be injected into your PATH so you have total control of what gets added.
+5. 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
+     ├───config
+     │   └───profile.d
+     └───opt
     ```

+  - (optional) Place your own executable files and custom app folders into `%userprofile%\cmder_config\bin`.
+    - This folder to be injected into your PATH by default.
+    - See `/max_depth [1-5]` in 'Command Line Arguments for `init.bat`' table to add subdirectories recursively.
+  - (optional) Place your own custom app folders into the `%user_profile%\cmder_config\opt`.
+    - This folder will NOT be injected into your PATH so you have total control of what gets added.
+
+
 * 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
@ -92,8 +102,8 @@ _(Some shortcuts are not yet documented, though they exist - please document the
 ### Access to multiple shells in one window using tabs
 You can open multiple tabs each containing one of the following shells:

-| Task                | Shell          | Description                                                                                                  |
-| ----                | -----          | -----------                                                                                                  |
+| Task                | Shell            | Description                                                                                                  |
+| ----                | -----            | -----------                                                                                                  |
 | Cmder               | `cmd.exe`        | Windows `cmd.exe` shell enhanced with Git, Git aware prompt, Clink (GNU Readline), and Aliases.              |
 | Cmder as Admin      | `cmd.exe`        | Administrative Windows `cmd.exe` Cmder shell.                                                                |
 | PowerShell          | `powershell.exe` | Windows PowerShell enhanced with Git and Git aware prompt .                                                  |
@ -124,7 +134,7 @@ cd mintty-colors-solarized/
 echo source \$CMDER_ROOT/vendor/mintty-colors-solarized/mintty-solarized-dark.sh>>$CMDER_ROOT/config/user_profile.sh
 ```

-You may find some Monokai color schemes for mintty to match Cmder [here](https://github.com/PhilipDaniels/mintty/blob/master/themes/Monokai) or [here](https://github.com/oumu/mintty-color-schemes/blob/master/base16-monokai-mod.minttyrc).
+You may find some Monokai color schemes for mintty to match Cmder [here](https://github.com/oumu/mintty-color-schemes/blob/master/base16-monokai-mod.minttyrc).

 ### Changing Cmder Default `cmd.exe` Shell Startup Behaviour Using Task Arguments

@ -153,7 +163,7 @@ You may find some Monokai color schemes for mintty to match Cmder [here](https:/
 | `/max_depth [1-5]`              | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`                                                     | 1                                      |
 | `/nix_tools [0-2]`              | Define how `*nix` tools are added to the path.  Prefer Windows Tools: 1, Prefer *nix Tools: 2, No `/usr/bin` in `%PATH%`: 0                        | 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-aliases.cmd` |
+| `/user_aliases [file path]`     | File path pointing to user aliases.                                                                                                                | `%CMDER_ROOT%\config\user_aliases.cmd` |
 | `/v`                            | Enables verbose output.                                                                                                                            | not set                                |
 | (custom arguments)              | User defined arguments processed by `cexec`. Type `cexec /?` for more useage.                                                                      | not set                                |

@ -164,32 +174,46 @@ Single user portable configuration is possible using the cmder specific shell co
 | ------------- | ----------------------------------------- |
 | Cmder         | `%CMDER_ROOT%\config\user_profile.cmd`    |
 | PowerShell    | `$ENV:CMDER_ROOT\config\user_profile.ps1` |
-| Bash/Mintty   | `$CMDER_ROOT/config/user_profile.sh`        |
+| 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`.

 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`        |
-| Bash/Mintty   | `$CMDER_ROOT/config/profile.d/*.sh`                 |
+| Shell         | Cmder `Profile.d` Scripts                          |
+| ------------- | -------------------------------------------------- |
+| 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`                |
+
+#### Git Status Opt-Out
+
+ To disable Cmder prompt git status globally add the following to `~/.gitconfig` or locally for a single repo `[repo]/.git/config` and start a new session.
+
+ *Note: This configuration is not portable*
+
+ ```
+ [cmder]
+   status = false      # Opt out of Git status for 'ALL' Cmder supported shells.
+   cmdstatus = false   # Opt out of Git status for 'Cmd.exe' shells.
+   psstatus = false    # Opt out of Git status for 'Powershell.exe and 'Pwsh.exe' shells.
+   shstatus = false    # Opt out of Git status for 'bash.exe' shells.
+ ```

 ### Aliases
 #### Cmder(`Cmd.exe`) Aliases
 You can define simple aliases for `cmd.exe` sessions with a command like `alias name=command`.  Cmd.exe aliases support optional parameters through the `$1-9` or the `$*` special characters so the alias `vi=vim.exe $*` typed as `vi [filename]` will open `[filename]` in `vim.exe`.

-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`
+Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/doskey) 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\user-aliases.cmd` 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`.  Anything 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_aliases.cmd`
 * `%CMDER_ROOT%\config\user_profile.cmd`

 #### Bash.exe|Mintty.exe Aliases
--- a/config/Readme.md
+++ b/config/Readme.md
@ -3,13 +3,14 @@
 All config files must be in this folder. If there is no option to set this folder 
 directly, it has to be hardlinked.

-* `user-aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
-  `vendor\user-aliases.cmd.default`.
+* `user_aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
+  `vendor\user_aliases.cmd.default`.
 * `*.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
+* `user_profile.{sh|cmd|ps1}`: startup files for bash|cmd|powershell tasks; called from their
  respective startup scripts in `vendor\`; autocreated from
-  `vendor\user-profile.{sh|cmd|ps1}.default` on first start of such a task.
+  `vendor\user_profile.{sh|cmd|ps1}.default` 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-ConEmu.xml`: settings from ConEmu the UI of Cmder. ;
+  Do not edit this file directly it is overwritten on each cmder.exe launch.
--- a/launcher/CmderLauncher.sln
+++ b/launcher/CmderLauncher.sln
@ -9,12 +9,18 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.Build.0 = Debug|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.ActiveCfg = Release|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.Build.0 = Release|Win32
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|x64.ActiveCfg = Debug|x64
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|x64.Build.0 = Debug|x64
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|x64.ActiveCfg = Release|x64
+		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/launcher/CmderLauncher.vcxproj
+++ b/launcher/CmderLauncher.vcxproj
@ -9,6 +9,14 @@
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}</ProjectGuid>
@ -30,6 +38,19 @@
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141_xp</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
@ -39,6 +60,12 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
@ -48,6 +75,14 @@
    <LinkIncremental>false</LinkIncremental>
    <TargetName>Cmder</TargetName>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>Cmder</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>Cmder</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <PrecompiledHeader>
@ -94,6 +129,52 @@
      <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MinSpace</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+    <PostBuildEvent>
+      <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ResourceCompile Include="src\Resource.rc">
      <FileType>RC</FileType>
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -71,7 +71,7 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }

-void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
+void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
 {
 #if USE_TASKBAR_API
 	wchar_t appId[MAX_PATH] = { 0 };
@ -111,7 +111,15 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr

 	PathRemoveFileSpec(exeDir);

-	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
+	if (PathFileExists(iconPath.c_str()))
+	{
+		std::copy(iconPath.begin(), iconPath.end(), icoPath);
+		icoPath[iconPath.length()] = 0;
+	}
+	else
+	{
+		PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
+	}

 	PathCombine(configDirPath, exeDir, L"config");

@ -532,6 +540,7 @@ struct cmderOptions
 	std::wstring cmderCfgRoot = L"";
 	std::wstring cmderStart = L"";
 	std::wstring cmderTask = L"";
+	std::wstring cmderIcon = L"";
 	std::wstring cmderRegScope = L"USER";
 	std::wstring cmderConEmuArgs = L"";
 	bool cmderSingle = false;
@ -593,6 +602,11 @@ cmderOptions GetOption()
 				cmderOptions.cmderTask = szArgList[i + 1];
 				i++;
 			}
+			else if (_wcsicmp(L"/icon", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderIcon = szArgList[i + 1];
+				i++;
+			}
 			else if (_wcsicmp(L"/single", szArgList[i]) == 0)
 			{
 				cmderOptions.cmderSingle = true;
@ -633,6 +647,17 @@ cmderOptions GetOption()
 				cmderOptions.cmderConEmuArgs = szArgList[i + 1];
 				i++;
 			}
+			/* Bare double dash, remaining commandline is for conemu */
+			else if (_wcsicmp(L"--", szArgList[i]) == 0)
+			{
+				std::wstring cmdline = std::wstring(GetCommandLineW());
+				auto doubledash = cmdline.find(L" -- ");
+				if (doubledash != std::string::npos)
+				{
+					cmderOptions.cmderConEmuArgs = cmdline.substr(doubledash + 4);
+				}
+				break;
+			}
 			else if (cmderOptions.cmderStart == L"")
 			{
 				int len = wcslen(szArgList[i]);
@ -648,13 +673,13 @@ cmderOptions GetOption()
 				}
 				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\n    /m\n\n    /x [ConEmu extra arguments]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+					MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    /icon [CMDER Icon Path]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\n    /x [ConEmu extra arguments]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
 					cmderOptions.error = true;
 				}
 			}
 			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\n    /m\n\n    /x [ConEmu extra arguments]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+				MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    /icon [CMDER Icon Path]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\n    /x [ConEmu extra arguments]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
 				cmderOptions.error = true;
 			}
 		}
@ -696,7 +721,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
 	}

 	return 0;
--- a/opt/Readme.md
+++ b/opt/Readme.md
@ -0,0 +1,5 @@
+## Bin
+
+This folder is for optional user packages and will not be automatically injected into the PATH.
+
+Use `%lib_path% enhance_path "%cmder_root%\[path to folder]"` in `%cmder_root%\config\user_profile.cmd` or `%cmder_root%\config\profile.d\*.cmd` to add to the path.
--- a/vendor/bin/alias.cmd
+++ b/vendor/bin/alias.cmd
@ -81,6 +81,9 @@ set alias_name=!alias_name:~1!
 :: trailing quotes added while validating
 set alias_value=!alias_value:~0,-1!

+:: '.' escaped
+set alias_name_esc=!alias_name:.=\.!
+
 ::remove spaces
 set _temp=%alias_name: =%

@ -91,7 +94,7 @@ if not ["%_temp%"] == ["%alias_name%"] (
 )

 :: replace already defined alias
-%WINDIR%\System32\findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /v /i "^%alias_name_esc%=" "%ALIASES%" >> "%ALIASES%.tmp"
 echo %alias_name%=%alias_value% >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey /macrofile="%ALIASES%"
 endlocal
@ -99,7 +102,11 @@ exit /b

 :p_del
 set del_alias=%~1
-%WINDIR%\System32\findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
+
+:: '.' escaped
+set del_alias_esc=!del_alias:.=\.!
+
+%WINDIR%\System32\findstr /v /i "^%del_alias_esc%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
 doskey /macrofile="%ALIASES%"
--- a/vendor/bin/cexec.cmd
+++ b/vendor/bin/cexec.cmd
@ -1,5 +1,4 @@
@echo off
-setlocal

 if "%~1" equ "" goto :wrongSyntax

@ -8,6 +7,7 @@ if not defined CMDER_USER_FLAGS (
  set "CMDER_USER_FLAGS= "
 )

+
 set "feNot=false"
 goto :parseArgument

@ -17,10 +17,8 @@ goto :parseArgument
 :parseArgument
 set "currenArgu=%~1"
 if /i "%currenArgu%" equ "/setPath" (
-  :: set %flag_exists% shortcut
-  endlocal
-  set "ccall=call %~dp0cexec.cmd"
-  set "cexec=%~dp0cexec.cmd"
+  set ccall=call "%~dp0cexec.cmd"
+  set cexec="%~dp0cexec.cmd"
 ) else if /i "%currenArgu%" == "/?" (
  goto :help
 ) else if /i "%currenArgu%" equ "/help" (
--- a/vendor/bin/cmder_diag.cmd
+++ b/vendor/bin/cmder_diag.cmd
@ -35,6 +35,12 @@ echo where git
 echo ------------------------------------
 where git

+echo.
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo
+
 echo.
 echo ------------------------------------
 echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
--- a/vendor/bin/cmder_diag.ps1
+++ b/vendor/bin/cmder_diag.ps1
@ -33,6 +33,12 @@ write-host get-command git
 write-host ------------------------------------
 get-command git

+write-host ''
+write-host ------------------------------------
+write-host systeminfo
+write-host ------------------------------------
+systeminfo
+
 write-host ''
 write-host ------------------------------------
 write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
--- a/vendor/bin/cmder_diag.sh
+++ b/vendor/bin/cmder_diag.sh
@ -31,7 +31,13 @@ echo ''
 echo ------------------------------------
 echo which git
 echo ------------------------------------
+
 which git
+echo ''
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo

 echo ''
 echo ------------------------------------
--- a/vendor/bin/vscode_init.cmd
+++ b/vendor/bin/vscode_init.cmd
@ -1,4 +1,26 @@
@echo off
+
+:: Find root dir
+
+if not defined CMDER_ROOT (
+    for /f "delims=" %%i in ("%~dp0\..\..") do (
+        set "cmder_root=%%~fi"
+    )
+)
+
+if defined cmder_user_bin (
+    set CMDER_VSCODE_INIT_ARGS=%cmder_user_bin%\vscode_init_args.cmd
+) else (
+    set CMDER_VSCODE_INIT_ARGS=%CMDER_ROOT%\bin\vscode_init_args.cmd
+)
+
+if not exist "%CMDER_VSCODE_INIT_ARGS%" (
+    echo Creating initial "%CMDER_VSCODE_INIT_ARGS%"...
+    copy "%CMDER_ROOT%\vendor\bin\vscode_init_args.cmd.default" "%CMDER_VSCODE_INIT_ARGS%"
+) else (
+    call "%CMDER_VSCODE_INIT_ARGS%"
+)
+
 IF [%1] == [] (
    REM -- manually opened console (Ctrl + Shift + `) --
    CALL "%~dp0..\init.bat"
--- a/vendor/bin/vscode_init_args.cmd.default
+++ b/vendor/bin/vscode_init_args.cmd.default
@ -0,0 +1,58 @@
+@echo off
+
+:: Below are the default Cmder session settings:
+::
+:: See "%CMDER_ROOT%\README.md" for details on these settings.
+::
+:: `Cmder.exe` Arguments:
+:: ----------------------
+:: 
+:: `/c [cmder_user_cfg_root]
+:: set cmder_user_bin=[cmder_user_cfg_root]\bin
+:: set cmder_user_config=[cmder_user_cfg_root]\config
+::
+:: `init.bat` Arguments
+:: --------------------
+::
+:: `/d`
+:: debug_output=0
+::
+:: `/v`
+:: verbose_output=0
+::
+:: `/f`
+:: fast_init=0
+::
+:: `/nix_tools`
+:: nix_tools=1
+::
+:: `/t`
+:: time_init=0
+::
+:: `/max_depth`
+:: max_depth=1
+::
+:: `/user_aliases`
+:: user_aliases=
+::
+:: `/git_install_root`
+:: GIT_INSTALL_ROOT=
+::
+:: `/home`
+:: HOME=
+::
+:: `/svn_ssh`
+:: SVN_SSH=
+
+echo Applying Cmder VSCode settings from '%~0'...
+
+if defined CMDER_CONFIGURED (
+    :: Set Cmder settings here for when VSCode is launched inside Cmder.
+    set verbose_output=1
+) else (
+    :: Set Cmder settings here for when VSCode is launched from outside Cmder.
+    set verbose_output=1
+)
+
+:: Set all required Cmder VSCode terminal environment settings above this line.
+echo Applying Cmder VSCode settings is complete!
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@ -280,6 +280,24 @@ local function get_svn_status()
    return true
 end

+---
+-- Get the status of working dir
+-- @return {bool}
+---
+local function get_git_status_setting()
+    gitStatusSetting = io.popen("git --no-pager config -l 2>nul")
+
+    for line in gitStatusSetting:lines() do
+        if string.match(line, 'cmder.status=false') or string.match(line, 'cmder.cmdstatus=false') then
+          gitStatusSetting:close()
+          return false
+        end
+    end
+    gitStatusSetting:close()
+
+    return true
+end
+
 local function git_prompt_filter()

    -- Colors for git status
@ -290,27 +308,30 @@ local function git_prompt_filter()
    }

    local git_dir = get_git_dir()
-    if git_dir then
-        -- if we're inside of git repo then try to detect current branch
-        local branch = get_git_branch(git_dir)
-        local color
-        if branch then
-            -- Has branch => therefore it is a git folder, now figure out status
-            local gitStatus = get_git_status()
-            local gitConflict = get_git_conflict()

-            color = colors.dirty
-            if gitStatus then
-                color = colors.clean
-            end
+    if get_git_status_setting() then
+      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
+              local gitStatus = get_git_status()
+              local gitConflict = get_git_conflict()

-            if gitConflict then
-                color = colors.conflict
-            end 
+              color = colors.dirty
+              if gitStatus then
+                  color = colors.clean
+              end

-            clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..verbatim(branch)..")")
-            return false
-        end
+              if gitConflict then
+                  color = colors.conflict
+              end 
+
+              clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..verbatim(branch)..")")
+              return false
+          end
+      end
    end

    -- No git present or not in git file
@ -385,7 +406,24 @@ local function svn_prompt_filter()
    return false
 end

+local function tilde_match (text, f, l)
+    if text == '~' then
+        clink.add_match(clink.get_env('userprofile'))
+        clink.matches_are_files()
+        return true
+    end
+
+    if text:sub(1, 1) == '~' then
+        clink.add_match(string.gsub(text, "~", clink.get_env('userprofile'), 1))
+        -- second match prevents adding a space so we can look for more matches
+        clink.add_match(string.gsub(text, "~", clink.get_env('userprofile'), 1) .. '+')
+        clink.matches_are_files()
+        return true
+    end
+end
+
 -- insert the set_prompt at the very beginning so that it runs first
+clink.register_match_generator(tilde_match, 1)
 clink.prompt.register_filter(set_prompt_filter, 1)
 clink.prompt.register_filter(hg_prompt_filter, 50)
 clink.prompt.register_filter(git_prompt_filter, 50)
@ -393,6 +431,8 @@ clink.prompt.register_filter(svn_prompt_filter, 50)
 clink.prompt.register_filter(percent_prompt_filter, 51)

 local completions_dir = clink.get_env('CMDER_ROOT')..'/vendor/clink-completions/'
+-- Execute '.init.lua' first to ensure package.path is set properly
+dofile(completions_dir..'.init.lua')
 for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
    -- Skip files that starts with _. This could be useful if some files should be ignored
    if not string.match(lua_module, '^_.*') then
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@ -1,3 +1,14 @@
+function getGitStatusSetting() {
+  gitStatusSetting=$(git --no-pager config -l 2>/dev/null)  
+
+  if [[ -n ${gitStatusSetting} ]] && [[ ${gitStatusSetting} =~ cmder.status=false ]] || [[ ${gitStatusSetting} =~ cmder.shstatus=false ]]
+  then
+    echo false
+  else
+    echo true
+  fi
+}
+
 if test -f /etc/profile.d/git-sdk.sh
 then
  TITLEPREFIX=SDK-${MSYSTEM#MINGW}
@ -7,7 +18,10 @@ fi

 if test -f ~/.config/git/git-prompt.sh
 then
-  . ~/.config/git/git-prompt.sh
+  if [[ $(getGitStatusSetting) == true ]]
+  then
+    . ~/.config/git/git-prompt.sh
+  fi
 else
  PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
  # PS1="$PS1"'\n'                 # new line
@ -26,9 +40,12 @@ else
    if test -f "$COMPLETION_PATH/git-prompt.sh"
    then
      . "$COMPLETION_PATH/git-completion.bash"
-      . "$COMPLETION_PATH/git-prompt.sh"
-      PS1="$PS1"'\[\033[36m\]'  # change color to cyan
-      PS1="$PS1"'`__git_ps1`'   # bash function
+      if [[ $(getGitStatusSetting) == true ]]
+      then
+        . "$COMPLETION_PATH/git-prompt.sh"
+        PS1="$PS1"'\[\033[36m\]'  # change color to cyan
+        PS1="$PS1"'`__git_ps1`'   # bash function
+      fi
    fi
  fi
  PS1="$PS1"'\[\033[0m\]'        # change color
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -9,13 +9,23 @@ set CMDER_INIT_START=%time%
 :: !!! Use "%CMDER_ROOT%\config\user_profile.cmd" to add your own startup commands

 :: 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 time_init=0
-set fast_init=0
-set max_depth=1
-:: Add *nix tools to end of path. 0 turns off *nix tools.
-set nix_tools=1
+if not defined verbose_output set verbose_output=0
+
+:: Use /d command line arg or set to 1 for debug output to aid in debugging.
+if not defined debug_output set debug_output=0
+
+:: Use /t command line arg or set to 1 to display init time.
+if not defined time_init set time_init=0
+
+:: Use /f command line arg to speed up init at the expense of some functionality.
+if not defined fast_init set fast_init=0
+
+:: Use /max_depth 1-5 to set max recurse depth for calls to `enhance_path_recursive`
+if not defined max_depth set max_depth=1
+
+:: Add *nix tools to end of path. 0 turns off *nix tools, 2 adds *nix tools to the front of thr path.
+if not defined nix_tools set nix_tools=1
+
 set "CMDER_USER_FLAGS= "

 :: Find root dir
@ -57,7 +67,7 @@ call "%cmder_root%\vendor\lib\lib_profile"
            set "max_depth=%~2"
            shift
        ) else (
-            %lib_console% show_error "'/max_depth' requires a number between 1 and 5!"
+            %print_error% "'/max_depth' requires a number between 1 and 5!"
            exit /b
        )
    ) else if /i "%1" == "/c" (
@ -78,7 +88,7 @@ call "%cmder_root%\vendor\lib\lib_profile"
            set "GIT_INSTALL_ROOT=%~2"
            shift
        ) else (
-            %lib_console% show_error "The Git install root folder "%~2", you specified does not exist!"
+            %print_error% "The Git install root folder "%~2", you specified does not exist!"
            exit /b
        )
    ) else if /i "%1"=="/nix_tools" (
@ -100,7 +110,7 @@ call "%cmder_root%\vendor\lib\lib_profile"
            set "HOME=%~2"
            shift
        ) else (
-            %lib_console% show_error The home folder "%2", you specified does not exist!
+            %print_error% The home folder "%2", you specified does not exist!
            exit /b
        )
    ) else if /i "%1" == "/svn_ssh" (
@ -115,24 +125,26 @@ goto var_loop
 :start
 :: Sets CMDER_SHELL, CMDER_CLINK, CMDER_ALIASES
 %lib_base% cmder_shell
-%lib_console% debug_output init.bat "Env Var - CMDER_ROOT=%CMDER_ROOT%"
-%lib_console% debug_output init.bat "Env Var - debug_output=%debug_output%"
+%print_debug% init.bat "Env Var - CMDER_ROOT=%CMDER_ROOT%"
+%print_debug% init.bat "Env Var - debug_output=%debug_output%"

 if defined CMDER_USER_CONFIG (
-    %lib_console% debug_output init.bat "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!"
+    %print_debug% init.bat "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!"
+
+    if not exist "%CMDER_USER_CONFIG%\opt" md "%CMDER_USER_CONFIG%\opt"
 )

 :: Pick right version of clink
 if "%PROCESSOR_ARCHITECTURE%"=="x86" (
-    set architecture=86
+    set clink_architecture=x86
    set architecture_bits=32
 ) else (
-    set architecture=64
+    set clink_architecture=x64
    set architecture_bits=64
 )

 if "%CMDER_CLINK%" == "1" (
-  %lib_console% verbose_output "Injecting Clink!"
+  %print_verbose% "Injecting Clink!"

  :: Run clink
  if defined CMDER_USER_CONFIG (
@ -141,17 +153,27 @@ if "%CMDER_CLINK%" == "1" (
      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
      echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
    )
-    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
+    "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
  ) else (
    if not exist "%CMDER_ROOT%\config\settings" (
      echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\settings"
      echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
    )
-    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
+    "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
  )
 ) else (
-  %lib_console% verbose_output "WARNING: Incompatible 'ComSpec/Shell' Detetected Skipping Clink Injection!"
+  %print_verbose% "WARNING: Incompatible 'ComSpec/Shell' Detetected Skipping Clink Injection!"
+)
+
+if "%CMDER_CONFIGURED%" GTR "1" (
+  %print_verbose% "Cmder is already configured, skipping Cmder Init!"
+
+  goto USER_ALIASES
+) else if "%CMDER_CONFIGURED%" == "1" (
+  %print_verbose% "Cmder is already configured, skipping to Cmder User Init!"
+
+  goto USER_CONFIG_START
 )

 :: Prepare for git-for-windows
@ -165,67 +187,30 @@ if not defined TERM set TERM=cygwin
 :: * 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 by examining the version string
-setlocal enabledelayedexpansion
 if defined GIT_INSTALL_ROOT (
    if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" goto :SPECIFIED_GIT
 ) else if "%fast_init%" == "1" (
    if exist "%CMDER_ROOT%\vendor\git-for-windows\cmd\git.exe" (
-      %lib_console% debug_output "Skipping Git Auto-Detect!"
+      %print_debug% "Skipping Git Auto-Detect!"
      goto :VENDORED_GIT
    )
 )

-%lib_console% debug_output init.bat "Looking for Git install root..."
+%print_debug% init.bat "Looking for Git install root..."

 :: get the version information for vendored git binary
-%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
+%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd" 2>nul
 %lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%

 :: 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
-    :: check if there's shim - and if yes follow the path
-    if exist git.shim (
-        for /F "tokens=2 delims== " %%I in (git.shim) do (
-            pushd %%~dpI
-            set "test_dir=!CD!"
-            popd
-        )
-    ) else (
-        set "test_dir=!CD!"
-    )
-    popd
-
-    :: get the version information for the user provided git binary
-    %lib_git% read_version USER "!test_dir!"
-    %lib_git% validate_version USER !GIT_VERSION_USER!
-
-    if !errorlevel! geq 0 (
-        :: compare the user git version against the vendored version
-        %lib_git% 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 (
-            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=
-        )
+    %lib_git% is_git_shim "%%~dpF"
+    %lib_git% get_user_git_version
+    %lib_git% compare_git_versions

+    if defined GIT_INSTALL_ROOT (
+        goto :FOUND_GIT
    )
 )

@ -233,61 +218,67 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do (
 :VENDORED_GIT
 if exist "%CMDER_ROOT%\vendor\git-for-windows" (
    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
-    %lib_console% debug_output "Using vendored Git '!GIT_VERSION_VENDORED!' from '!GIT_INSTALL_ROOT!..."
+    %print_debug% "Using vendored Git '%GIT_VERSION_VENDORED%'..."
    goto :CONFIGURE_GIT
 ) else (
    goto :NO_GIT
 )

 :SPECIFIED_GIT
-%lib_console% debug_output "Using /GIT_INSTALL_ROOT from '%GIT_INSTALL_ROOT%..."
+%print_debug% "Using /GIT_INSTALL_ROOT..."
 goto :CONFIGURE_GIT

 :FOUND_GIT
-%lib_console% debug_output "Using found Git '!GIT_VERSION_USER!' from '%GIT_INSTALL_ROOT%..."
+%print_debug% "Using found Git '%GIT_VERSION_USER%' from '%GIT_INSTALL_ROOT%..."
 goto :CONFIGURE_GIT

 :CONFIGURE_GIT
+%print_debug% "Using Git from '%GIT_INSTALL_ROOT%..."
 :: 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
-    if %nix_tools% equ 1 (
-        %lib_console% debug_output init.bat "Preferring Windows commands"
-        set "path_position=append"
-    ) else (
-        %lib_console% debug_output init.bat "Preferring *nix commands"
-        set "path_position="
-    )
+if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" %lib_path% enhance_path "%GIT_INSTALL_ROOT%\cmd" ""

-    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" !path_position!
-    if exist "!GIT_INSTALL_ROOT!\mingw32" (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32\bin" !path_position!
-    ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64\bin" !path_position!
-    )
-
-    if %nix_tools% geq 1 (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" !path_position!
-    )
-
-    :: 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"
-    
-    if not defined LANG (
-        :: Find locale.exe: From the git install root, from the path, using the git installed env, or fallback using the env from the path.
-        if not defined git_locale if exist "!GIT_INSTALL_ROOT!\usr\bin\locale.exe" set git_locale="!GIT_INSTALL_ROOT!\usr\bin\locale.exe"
-        if not defined git_locale for /F "delims=" %%F in ('where locale.exe 2^>nul') do (if not defined git_locale  set git_locale="%%F")
-        if not defined git_locale if exist "!GIT_INSTALL_ROOT!\usr\bin\env.exe" set git_locale="!GIT_INSTALL_ROOT!\usr\bin\env.exe" /usr/bin/locale
-        if not defined git_locale set git_locale=env /usr/bin/locale
-        for /F "delims=" %%F in ('!git_locale! -uU 2') do (
-            set "LANG=%%F"
-        )
-    )
+:: Add the unix commands at the end to not shadow windows commands like more
+if %nix_tools% equ 1 (
+    %print_verbose% "Preferring Windows commands"
+    set "path_position=append"
+) else (
+    %print_verbose% "Preferring *nix commands"
+    set "path_position="
 )

-endlocal & set "PATH=%PATH%" & set "LANG=%LANG%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
-%lib_console% debug_output init.bat "Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
-%lib_console% debug_output init.bat "Found Git in: '%GIT_INSTALL_ROOT%'"
+if %nix_tools% geq 1 (
+    if exist "%GIT_INSTALL_ROOT%\mingw32" (
+        %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw32\bin" %path_position%
+    ) else if exist "%GIT_INSTALL_ROOT%\mingw64" (
+        %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw64\bin" %path_position%
+    )
+
+    %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position%
+)
+
+:: 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"
+
+:: Find locale.exe: From the git install root, from the path, using the git installed env, or fallback using the env from the path.
+if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\locale.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\locale.exe"
+if not defined git_locale for /F "tokens=* delims=" %%F in ('where locale.exe 2^>nul') do ( if not defined git_locale  set git_locale="%%F" )
+if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\env.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\env.exe" /usr/bin/locale
+if not defined git_locale for /F "tokens=* delims=" %%F in ('where env.exe 2^>nul') do ( if not defined git_locale  set git_locale="%%F" /usr/bin/locale )
+
+setlocal enabledelayedexpansion
+if defined git_locale (
+
+  REM %print_debug% init.bat "Env Var - git_locale=!git_locale!"
+  if not defined LANG (
+      for /F "delims=" %%F in ('!git_locale! -uU 2') do (
+          set "LANG=%%F"
+      )
+  )
+)
+endlocal && set LANG=%LANG%
+
+%print_debug% init.bat "Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
+%print_debug% init.bat "Found Git in: '%GIT_INSTALL_ROOT%'"
 goto :PATH_ENHANCE

 :NO_GIT
@ -296,9 +287,11 @@ endlocal

 :PATH_ENHANCE
 %lib_path% enhance_path "%CMDER_ROOT%\vendor\bin"
-%lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
+
+:USER_CONFIG_START
+%lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" 0 %max_depth%
 if defined CMDER_USER_BIN (
-  %lib_path% enhance_path_recursive "%CMDER_USER_BIN%" %max_depth%
+  %lib_path% enhance_path_recursive "%CMDER_USER_BIN%" 0 %max_depth%
 )
 %lib_path% enhance_path "%CMDER_ROOT%" append

@ -309,6 +302,7 @@ if defined CMDER_USER_CONFIG (
  %lib_profile% run_profile_d "%CMDER_USER_CONFIG%\profile.d"
 )

+:USER_ALIASES
 :: Allows user to override default aliases store using profile.d
 :: scripts run above by setting the 'aliases' env variable.
 ::
@ -331,22 +325,11 @@ if "%CMDER_ALIASES%" == "1" (
  )

  REM Make sure we have a self-extracting user_aliases.cmd file
-  setlocal enabledelayedexpansion
  if not exist "%user_aliases%" (
      echo Creating initial user_aliases store in "%user_aliases%"...
      copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
  ) else (
-      type "%user_aliases%" | %WINDIR%\System32\findstr /i ";= Add aliases below here" >nul
-      if "!errorlevel!" == "1" (
-          echo Creating initial user_aliases store in "%user_aliases%"...
-          if defined CMDER_USER_CONFIG (
-              copy "%user_aliases%" "%user_aliases%.old_format"
-              copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
-          ) else (
-              copy "%user_aliases%" "%user_aliases%.old_format"
-              copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
-          )
-      )
+    %lib_base% update_legacy_aliases
  )

  :: Update old 'user_aliases' to new self executing 'user_aliases.cmd'
@ -359,12 +342,13 @@ if "%CMDER_ALIASES%" == "1" (
    type "%user_aliases%.old_format" >> "%user_aliases%"
    del "%user_aliases%.old_format"
  )
-  endlocal
 )

 :: Add aliases to the environment
 call "%user_aliases%"

+if "%CMDER_CONFIGURED%" gtr "1" goto CMDER_CONFIGURED
+
 :: 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
@ -377,12 +361,12 @@ if exist "%GIT_INSTALL_ROOT%\post-install.bat" (

 :: Set home path
 if not defined HOME set "HOME=%USERPROFILE%"
-%lib_console% debug_output init.bat "Env Var - HOME=%HOME%"
+%print_debug% init.bat "Env Var - HOME=%HOME%"

 set "initialConfig=%CMDER_ROOT%\config\user_profile.cmd"
 if exist "%CMDER_ROOT%\config\user_profile.cmd" (
    REM Create this file and place your own command in there
-    %lib_console% debug_output init.bat "Calling - %CMDER_ROOT%\config\user_profile.cmd"
+    %print_debug% init.bat "Calling - %CMDER_ROOT%\config\user_profile.cmd"
    call "%CMDER_ROOT%\config\user_profile.cmd"
 )

@ -390,7 +374,7 @@ if defined CMDER_USER_CONFIG (
  set "initialConfig=%CMDER_USER_CONFIG%\user_profile.cmd"
  if exist "%CMDER_USER_CONFIG%\user_profile.cmd" (
      REM Create this file and place your own command in there
-      %lib_console% debug_output init.bat "Calling - %CMDER_USER_CONFIG%\user_profile.cmd
+      %print_debug% init.bat "Calling - %CMDER_USER_CONFIG%\user_profile.cmd"
      call "%CMDER_USER_CONFIG%\user_profile.cmd"
  )
 )
@ -414,11 +398,13 @@ if "%CMDER_ALIASES%" == "1" if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMD
 )

 set initialConfig=
-set CMDER_CONFIGURED=1
+
+:CMDER_CONFIGURED
+if not defined CMDER_CONFIGURED set CMDER_CONFIGURED=1

 set CMDER_INIT_END=%time%

 if %time_init% gtr 0 (
-  "%cmder_root%\vendor\bin\timer.cmd" %CMDER_INIT_START% %CMDER_INIT_END%
+  "%cmder_root%\vendor\bin\timer.cmd" "%CMDER_INIT_START%" "%CMDER_INIT_END%"
 )
 exit /b
--- a/vendor/lib/lib_base.cmd
+++ b/vendor/lib/lib_base.cmd
@ -66,16 +66,29 @@ exit /b
    echo %comspec% | %WINDIR%\System32\find /i "\tccle" > nul && set "CMDER_SHELL=tccle"

    if not defined CMDER_CLINK (
-      set CMDER_CLINK=1
-      if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0
-      if "%CMDER_SHELL%" equ "tccle" set CMDER_CLINK=0
+        set CMDER_CLINK=1
+        if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0
+        if "%CMDER_SHELL%" equ "tccle" set CMDER_CLINK=0
    )

-
    if not defined CMDER_ALIASES (
-      set CMDER_ALIASES=1
-      if "%CMDER_SHELL%" equ "tcc" set CMDER_ALIASES=0
-      if "%CMDER_SHELL%" equ "tccle" set CMDER_ALIASES=0
+        set CMDER_ALIASES=1
+        if "%CMDER_SHELL%" equ "tcc" set CMDER_ALIASES=0
+        if "%CMDER_SHELL%" equ "tccle" set CMDER_ALIASES=0
    )

    exit /b
+
+:update_legacy_aliases
+    type "%user_aliases%" | %WINDIR%\System32\findstr /i ";= Add aliases below here" >nul
+    if "%errorlevel%" == "1" (
+        echo Creating initial user_aliases store in "%user_aliases%"...
+        if defined CMDER_USER_CONFIG (
+            copy "%user_aliases%" "%user_aliases%.old_format"
+            copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
+        ) else (
+            copy "%user_aliases%" "%user_aliases%.old_format"
+            copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
+        )
+    )
+    exit /b
--- a/vendor/lib/lib_console.cmd
+++ b/vendor/lib/lib_console.cmd
@ -1,10 +1,15 @@
@echo off

-if "%fast_init%" == "1" exit /b
-
 call "%~dp0lib_base.cmd"
 set lib_console=call "%~dp0lib_console.cmd"

+:: Much faster than using "%lib_console% debug_output ..." etc.
+set print_debug=if %debug_output% gtr 0 %lib_console% debug_output
+set print_verbose=if %verbose_output% gtr 0 %lib_console% verbose_output
+set print_error=%lib_console% show_error
+
+if "%fast_init%" == "1" exit /b
+
 if "%~1" == "/h" (
    %lib_base% help "%~0"
 ) else if "%1" neq "" (
--- a/vendor/lib/lib_git.cmd
+++ b/vendor/lib/lib_git.cmd
@ -34,33 +34,33 @@ exit /b
 :::  GIT_VERSION_[GIT SCOPE] <out> Env variable containing Git semantic version string
 :::-------------------------------------------------------------------------------

-    setlocal enabledelayedexpansion
    :: clear the variables
    set GIT_VERSION_%~1=

    :: set the executable path
    set "git_executable=%~2\git.exe"
-    %lib_console% debug_output :read_version "Env Var - git_executable=%git_executable%"
+    %print_debug% :read_version "Env Var - git_executable=%git_executable%"

    :: check if the executable actually exists
    if not exist "%git_executable%" (
-        %lib_console% debug_output :read_version "%git_executable% does not exist."
+        %print_debug% :read_version "%git_executable% does not exist."
        exit /b -255
    )

    :: get the git version in the provided directory
-    for /F "tokens=1,2,3 usebackq" %%A in (`"%git_executable%" --version 2^>nul`) do (
+    "%git_executable%" --version > "%temp%\git_version.txt"
+    setlocal enabledelayedexpansion
+    for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
        if /i "%%A %%B" == "git version" (
            set "GIT_VERSION=%%C"
-            %lib_console% debug_output :read_version "Env Var - GIT_VERSION_%~1=!GIT_VERSION!"
        ) else (
-            %lib_console% show_error "git --version" returned an inproper version string!
+            echo "'git --version' returned an inproper version string!"
            pause
            exit /b
        )
    )
+    endlocal & set "GIT_VERSION_%~1=%GIT_VERSION%" & %print_debug% :read_version "Env Var - GIT_VERSION_%~1=%GIT_VERSION%"

-    endlocal & set "GIT_VERSION_%~1=%GIT_VERSION%"
    exit /b

 :parse_version
@ -89,11 +89,9 @@ exit /b
 :::-------------------------------------------------------------------------------

    :: process a `x.x.x.xxxx.x` formatted string
-    set "%~1_MAJOR="
-    set "%~1_MINOR="
-    set "%~1_PATCH="
-    set "%~1_BUILD="
-    %lib_console% debug_output :parse_version "ARGV[1]=%~1, ARGV[2]=%~2"
+    %print_debug% :parse_version "ARGV[1]=%~1, ARGV[2]=%~2"
+
+    setlocal enabledelayedexpansion
    for /F "tokens=1-3* delims=.,-" %%A in ("%2") do (
        set "%~1_MAJOR=%%A"
        set "%~1_MINOR=%%B"
@ -101,8 +99,17 @@ exit /b
        set "%~1_BUILD=%%D"
    )

+    REM endlocal & set "%~1_MAJOR=!%~1_MAJOR!" & set "%~1_MINOR=!%~1_MINOR!" & set "%~1_PATCH=!%~1_PATCH!" & set "%~1_BUILD=!%~1_BUILD!"
+    if "%~1" == "VENDORED" (
+      endlocal & set "%~1_MAJOR=%VENDORED_MAJOR%" & set "%~1_MINOR=%VENDORED_MINOR%" & set "%~1_PATCH=%VENDORED_PATCH%" & set "%~1_BUILD=%VENDORED_BUILD%"
+    ) else (
+      endlocal & set "%~1_MAJOR=%USER_MAJOR%" & set "%~1_MINOR=%USER_MINOR%" & set "%~1_PATCH=%USER_PATCH%" & set "%~1_BUILD=%USER_BUILD%"
+    )
+
    exit /b

+:endlocal_set_git_version
+
 :validate_version
 :::===============================================================================
 :::validate_version - Validate semantic version string 'x.x.x.x'.
@ -122,11 +129,17 @@ exit /b
 :::-------------------------------------------------------------------------------

    :: now parse the version information into the corresponding variables
-    %lib_console% debug_output :validate_version "ARGV[1]=%~1, ARGV[2]=%~2"
+    %print_debug% :validate_version "ARGV[1]=%~1, ARGV[2]=%~2"
+
    call :parse_version %~1 %~2

    :: ... and maybe display it, for debugging purposes.
-    %lib_console% debug_output :validate_version "Found Git Version for %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!"
+    REM %print_debug% :validate_version "Found Git Version for %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!"
+    if "%~1" == "VENDORED" (
+      %print_debug% :validate_version "Found Git Version for %~1: %VENDORED_MAJOR%.%VENDORED_MINOR%.%VENDORED_PATCH%.%VENDORED_BUILD%"
+    ) else (
+      %print_debug% :validate_version "Found Git Version for %~1: %USER_MAJOR%.%USER_MINOR%.%USER_PATCH%.%USER_BUILD%"
+    )
    exit /b

 :compare_versions
@ -150,21 +163,115 @@ exit /b
    :: 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.

-    %lib_console% debug_output Comparing:
-    %lib_console% debug_output %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
-    %lib_console% debug_output %~2: !%~2_MAJOR!.!%~2_MINOR!.!%~2_PATCH!.!%~2_BUILD!
+    %print_debug% Comparing:
+    %print_debug% %~1: %USER_MAJOR%.%USER_MINOR%.%USER_PATCH%.%USER_BUILD%
+    %print_debug% %~2: %VENDORED_MAJOR%.%VENDORED_MINOR%.%VENDORED_PATCH%.%VENDORED_BUILD%

-    if !%~1_MAJOR! GTR !%~2_MAJOR! (exit /b  1)
-    if !%~1_MAJOR! LSS !%~2_MAJOR! (exit /b -1)
+    setlocal enabledelayedexpansion
+    if !%~1_MAJOR! GTR !%~2_MAJOR! (endlocal & exit /b  1)
+    if !%~1_MAJOR! LSS !%~2_MAJOR! (endlocal & exit /b -1)

-    if !%~1_MINOR! GTR !%~2_MINOR! (exit /b  1)
-    if !%~1_MINOR! LSS !%~2_MINOR! (exit /b -1)
+    if !%~1_MINOR! GTR !%~2_MINOR! (endlocal & exit /b  1)
+    if !%~1_MINOR! LSS !%~2_MINOR! (endlocal & exit /b -1)

-    if !%~1_PATCH! GTR !%~2_PATCH! (exit /b  1)
-    if !%~1_PATCH! LSS !%~2_PATCH! (exit /b -1)
+    if !%~1_PATCH! GTR !%~2_PATCH! (endlocal & exit /b  1)
+    if !%~1_PATCH! LSS !%~2_PATCH! (endlocal & exit /b -1)

-    if !%~1_BUILD! GTR !%~2_BUILD! (exit /b  1)
-    if !%~1_BUILD! LSS !%~2_BUILD! (exit /b -1)
+    if !%~1_BUILD! GTR !%~2_BUILD! (endlocal & exit /b  1)
+    if !%~1_BUILD! LSS !%~2_BUILD! (endlocal & exit /b -1)

    :: looks like we have the same versions.
-    exit /b 0
+    endlocal & exit /b 0
+
+:::===============================================================================
+:::is_git_shim
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% is_git_shim [filepath]
+:::.
+:::required:
+:::.
+:::  [filepath]    <in>
+:::-------------------------------------------------------------------------------
+
+:is_git_shim
+    pushd "%~1"
+    :: check if there's shim - and if yes follow the path
+    setlocal enabledelayedexpansion
+    if exist git.shim (
+        for /F "tokens=2 delims== " %%I in (git.shim) do (
+            pushd %%~dpI
+            set "test_dir=!CD!"
+            popd
+        )
+    ) else (
+        set "test_dir=!CD!"
+    )
+    endlocal & set "test_dir=%test_dir%"
+
+    popd
+    exit /b
+
+:::===============================================================================
+:::compare_git_versions
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% compare_git_versions
+:::-------------------------------------------------------------------------------
+
+:compare_git_versions
+    setlocal enabledelayedexpansion
+    if ERRORLEVEL 0 (
+        :: compare the user git version against the vendored version
+        !lib_git! compare_versions USER VENDORED
+
+        :: use the user provided git if its version is greater than, or equal to the vendored git
+        if ERRORLEVEL 0 (
+            if exist "!test_dir:~0,-4!\cmd\git.exe" (
+                set "GIT_INSTALL_ROOT=!test_dir:~0,-4!"
+            ) else (
+                set "GIT_INSTALL_ROOT=!test_dir!"
+            )
+        ) else (
+            %print_verbose% "Found old !GIT_VERSION_USER! in !test_dir!, but not using..."
+        )
+    ) else (
+        :: compare the user git version against the vendored version
+        :: if the user provided git executable is not found
+        IF ERRORLEVEL -255 IF NOT ERRORLEVEL -254 (
+            %print_verbose% "No git at "!git_executable!" found."
+            set test_dir=
+        )
+    )
+    endlocal && set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%" && set test_dir=
+
+    exit /b
+
+:::===============================================================================
+:::get_user_git_version - get the version information for the user provided git binary
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% get_user_git_version
+:::-------------------------------------------------------------------------------
+
+:get_user_git_version
+    :: get the version information for the user provided git binary
+    %lib_git% read_version USER "%test_dir%" 2>nul
+    %lib_git% validate_version USER %GIT_VERSION_USER%
+    exit  /b
+
--- a/vendor/lib/lib_path.cmd
+++ b/vendor/lib/lib_path.cmd
@ -32,17 +32,17 @@ exit /b
 :::options:
 :::
 :::  append     <in> Append to the path env variable rather than pre-pend.
+::B
 :::
 :::output:
 :::
 :::  path       <out> Sets the path env variable if required.
 :::-------------------------------------------------------------------------------

-    setlocal enabledelayedexpansion
    if "%~1" neq "" (
        set "add_path=%~1"
    ) else (
-        %lib_console% show_error "You must specify a directory to add to the path!"
+        %print_error% "You must specify a directory to add to the path!"
        exit 1
    )

@ -52,50 +52,78 @@ exit /b
        set "position="
    )

+    dir "%add_path%" | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
+    if "%ERRORLEVEL%" == "0" (
+        set "add_to_path=%add_path%"
+    ) else (
+        set "add_to_path="
+    )
+
    if "%fast_init%" == "1" (
      if "%position%" == "append" (
-        set "PATH=%PATH%;%add_path%"
+        set "PATH=%PATH%;%add_to_path%"
      ) else (
-        set "PATH=%add_path%;%PATH%"
+        set "PATH=%add_to_path%;%PATH%"
      )
      goto :end_enhance_path
+    ) else if "add_to_path" equ "" (
+      goto :end_enhance_path
    )

    set found=0
-    set "find_query=%add_path%"
+    set "find_query=%add_to_path%"
    set "find_query=%find_query:\=\\%"
    set "find_query=%find_query: =\ %"
+    set OLD_PATH=%PATH%

-    if "%CMDER_CONFIGURED%" == "1" (
-      %lib_console% debug_output  :enhance_path "Env Var - find_query=%find_query%"
-      echo "%path%"|%WINDIR%\System32\findstr >nul /I /R ";%find_query%\"$"
-      if "!ERRORLEVEL!" == "0" set found=1
-    )
-    %lib_console% debug_output  :enhance_path "Env Var 1 - found=!found!"
-
+    setlocal enabledelayedexpansion
    if "!found!" == "0" (
-        if "%CMDER_CONFIGURED%" == "1" (
-            echo "%path%"|%WINDIR%\System32\findstr >nul /i /r ";%find_query%;"
-            if "!ERRORLEVEL!" == "0" set found=1
-        )
-        %lib_console% debug_output  :enhance_path "Env Var 2 - found=!found!"
+      echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!;"
+      call :set_found
    )
+    %print_debug%  :enhance_path "Env Var INSIDE PATH !find_query! - found=!found!"
+
+    if /i "!position!" == "append" (
+      if "!found!" == "0" (
+        echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!\"$"
+        call :set_found
+      )
+      %print_debug%  :enhance_path "Env Var END PATH !find_query! - found=!found!"
+    ) else (
+      if "!found!" == "0" (
+        echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:"^\"!find_query!;"
+        call :set_found
+      )
+      %print_debug%  :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!"
+    )
+    endlocal & set found=%found%

    if "%found%" == "0" (
-        %lib_console% debug_output :enhance_path "BEFORE Env Var - PATH=!path!"
        if /i "%position%" == "append" (
-            %lib_console% debug_output :enhance_path "Appending '%add_path%'"
-            set "PATH=%PATH%;%add_path%"
+            %print_debug% :enhance_path "Appending '%add_to_path%'"
+            set "PATH=%PATH%;%add_to_path%"
        ) else (
-            %lib_console% debug_output :enhance_path "Prepending '%add_path%'"
-            set "PATH=%add_path%;%PATH%"
+            %print_debug% :enhance_path "Prepending '%add_to_path%'"
+            set "PATH=%add_to_path%;%PATH%"
        )

-        %lib_console% debug_output  :enhance_path "AFTER Env Var - PATH=!path!"
+        set found=1
    )

    :end_enhance_path
-    endlocal & set "PATH=%PATH:;;=;%"
+    set "PATH=%PATH:;;=;%"
+    if NOT "%OLD_PATH%" == "%PATH%" (
+      %print_debug%  :enhance_path "END Env Var - PATH=%path%"
+      %print_debug%  :enhance_path "Env Var %find_query% - found=%found%"
+    )
+    set "position="
+    exit /b
+
+:set_found
+    if "%ERRORLEVEL%" == "0" (
+      set found=1
+    )
+
    exit /b

 :enhance_path_recursive
@ -125,50 +153,73 @@ exit /b
 :::.
 :::  path       <out> Sets the path env variable if required.
 :::-------------------------------------------------------------------------------
-    setlocal enabledelayedexpansion
    if "%~1" neq "" (
        set "add_path=%~1"
    ) else (
-        %lib_console% show_error "You must specify a directory to add to the path!"
+        %print_error% "You must specify a directory to add to the path!"
        exit 1
    )

-    if "%~2" gtr "1" (
-        set "max_depth=%~2"
-    ) else (
-        set "max_depth=1"
-    )
+    set "depth=%~2"
+    set "max_depth=%~3"

-    if "%~3" neq "" if /i "%~3" == "append" (
-        set "position=%~3"
+    if "%~4" neq "" if /i "%~4" == "append" (
+        set "position=%~4"
    ) else (
        set "position="
    )

-    if "%fast_init%" == "1" (
-      call :enhance_path "%add_path%" %position%
-      goto :end_enhance_path_recursive
+    dir "%add_path%" 2>NUL | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
+
+    if "%ERRORLEVEL%" == "0" (
+        set "add_to_path=%add_path%"
+    ) else (
+        set "add_to_path="
    )

-    if "%depth%" == "" set depth=0
-
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - add_path=%add_path%"
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - position=%position%"
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
-
-    if %max_depth% gtr !depth! (
-        %lib_console% 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 (
-            %lib_console% debug_output  :enhance_path_recursive "Env Var BEFORE - depth=!depth!"
-            %lib_console% debug_output :enhance_path_recursive "Found Subdirectory - '%%~fi'"
-            call :enhance_path_recursive "%%~fi" %max_depth% %position%
-            %lib_console% debug_output  :enhance_path_recursive "Env Var AFTER- depth=!depth!"
+    if "%fast_init%" == "1" (
+        if "%add_to_path%" neq "" (
+            call :enhance_path "%add_to_path%" %position%
        )
    )

-    :end_enhance_path_recursive
-    endlocal & set "PATH=%PATH%"
+    set "PATH=%PATH:;;=;%"
+    if "%fast_init%" == "1" (
+      exit /b
+    )
+
+    %print_debug%  :enhance_path_recursive "Env Var - add_path=%add_to_path%"
+    %print_debug%  :enhance_path_recursive "Env Var - position=%position%"
+    %print_debug%  :enhance_path_recursive "Env Var - depth=%depth%"
+    %print_debug%  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
+
+    if %max_depth% gtr %depth% (
+        if "%add_to_path%" neq "" (
+            %print_debug% :enhance_path_recursive "Adding parent directory - '%add_to_path%'"
+            call :enhance_path "%add_to_path%" %position%
+        )
+        call :set_depth
+        call :loop_depth
+    )
+
+    set "PATH=%PATH%"
+
    exit /b
+
+: set_depth
+    set /a "depth=%depth%+1"
+    exit /b
+
+:loop_depth
+    if %depth% == %max_depth% (
+        exit /b
+    )
+
+    for /d %%i in ("%add_path%\*") do (
+        %print_debug%  :enhance_path_recursive "Env Var BEFORE - depth=%depth%"
+        %print_debug% :enhance_path_recursive "Found Subdirectory - '%%~fi'"
+        call :enhance_path_recursive "%%~fi" %depth% %max_depth% %position%
+        %print_debug%  :enhance_path_recursive "Env Var AFTER- depth=%depth%"
+    )
+    exit /b
+
--- a/vendor/lib/lib_profile.cmd
+++ b/vendor/lib/lib_profile.cmd
@ -38,7 +38,7 @@ exit /b

  pushd "%~1"
  for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
-    %lib_console% verbose_output "Calling '%~1\%%x'..."
+    %print_verbose% "Calling '%~1\%%x'..."
    call "%~1\%%x"
  )
  popd
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@ -32,53 +32,13 @@ $moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorActi
 # Add Cmder modules directory to the autoload path.
 $CmderModulePath = Join-path $PSScriptRoot "psmodules/"

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

-function Configure-Git($GIT_INSTALL_ROOT){
-  $env:Path += $(";" + $GIT_INSTALL_ROOT + "\cmd")
-
-  # Add "$GIT_INSTALL_ROOT\usr\bin" to the path if exists and not done already
-  $GIT_INSTALL_ROOT_ESC=$GIT_INSTALL_ROOT.replace('\','\\')
-  if ((test-path "$GIT_INSTALL_ROOT\usr\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\usr\\bin")) {
-      $env:path = "$env:path;$GIT_INSTALL_ROOT\usr\bin"
-  }
-  
-  # Add "$GIT_INSTALL_ROOT\mingw[32|64]\bin" to the path if exists and not done already
-  if ((test-path "$GIT_INSTALL_ROOT\mingw32\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\mingw32\\bin")) {
-      $env:path = "$env:path;$GIT_INSTALL_ROOT\mingw32\bin"
-  } elseif ((test-path "$GIT_INSTALL_ROOT\mingw64\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\mingw64\\bin")) {
-      $env:path = "$env:path;$GIT_INSTALL_ROOT\mingw64\bin"
-  }
-}
-
-$gitLoaded = $false
-function Import-Git($Loaded){
-    if($Loaded) { return }
-    $GitModule = Get-Module -Name Posh-Git -ListAvailable
-    if($GitModule | select version | where version -le ([version]"0.6.1.20160330")){
-        Import-Module Posh-Git > $null
-    }
-    if(-not ($GitModule) ) {
-        Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart cmder."
-    }
-    # Make sure we only run once by alawys returning true
-    return $true
-}
-
-function checkGit($Path) {
-    if (Test-Path -Path (Join-Path $Path '.git') ) {
-        $gitLoaded = Import-Git $gitLoaded
-        Write-VcsStatus
-        return
-    }
-    $SplitPath = split-path $path
-    if ($SplitPath) {
-        checkGit($SplitPath)
-    }
-}
-
 try {
    # Check if git is on PATH, i.e. Git already installed on system
    Get-command -Name "git" -ErrorAction Stop >$null
@ -96,6 +56,20 @@ if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
    Set-PSReadlineOption -ExtraPromptLineCount 1
 }

+# Pre assign default prompt hooks so the first run of cmder gets a working prompt.
+$env:gitLoaded = $false
+[ScriptBlock]$PrePrompt = {}
+[ScriptBlock]$PostPrompt = {}
+[ScriptBlock]$CmderPrompt = {
+    $Host.UI.RawUI.ForegroundColor = "White"
+    Write-Host -NoNewline "$([char]0x200B)"
+    Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
+    if (get-command git -erroraction silentlycontinue) {
+        checkGit($pwd.ProviderPath)
+    }
+    Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
+}
+
 # Enhance Path
 $env:Path = "$Env:CMDER_ROOT\bin;$Env:CMDER_ROOT\vendor\bin;$env:Path;$Env:CMDER_ROOT"

@ -172,16 +146,6 @@ if (! (Test-Path $CmderUserProfilePath) ) {
 # This allows users to configure the prompt in their user_profile.ps1 or config\profile.d\*.ps1
 if ( $(get-command prompt).Definition -match 'PS \$\(\$executionContext.SessionState.Path.CurrentLocation\)\$\(' -and `
  $(get-command prompt).Definition -match '\(\$nestedPromptLevel \+ 1\)\) ";') {
-  # Pre assign the hooks so the first run of cmder gets a working prompt.
-  [ScriptBlock]$PrePrompt = {}
-  [ScriptBlock]$PostPrompt = {}
-  [ScriptBlock]$CmderPrompt = {
-      $Host.UI.RawUI.ForegroundColor = "White"
-      Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
-      if (get-command git -erroraction silentlycontinue) {
-          checkGit($pwd.ProviderPath)
-      }
-  }

  <#
  This scriptblock runs every time the prompt is returned.
@ -193,7 +157,6 @@ if ( $(get-command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
      $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 " "
--- a/vendor/psmodules/Cmder.ps1
+++ b/vendor/psmodules/Cmder.ps1
@ -0,0 +1,59 @@
+function Configure-Git($GIT_INSTALL_ROOT){
+  $env:Path += $(";" + $GIT_INSTALL_ROOT + "\cmd")
+
+  # Add "$GIT_INSTALL_ROOT\usr\bin" to the path if exists and not done already
+  $GIT_INSTALL_ROOT_ESC=$GIT_INSTALL_ROOT.replace('\','\\')
+  if ((test-path "$GIT_INSTALL_ROOT\usr\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\usr\\bin")) {
+      $env:path = "$env:path;$GIT_INSTALL_ROOT\usr\bin"
+  }
+
+  # Add "$GIT_INSTALL_ROOT\mingw[32|64]\bin" to the path if exists and not done already
+  if ((test-path "$GIT_INSTALL_ROOT\mingw32\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\mingw32\\bin")) {
+      $env:path = "$env:path;$GIT_INSTALL_ROOT\mingw32\bin"
+  } elseif ((test-path "$GIT_INSTALL_ROOT\mingw64\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\mingw64\\bin")) {
+      $env:path = "$env:path;$GIT_INSTALL_ROOT\mingw64\bin"
+  }
+}
+
+function Import-Git(){
+
+    $GitModule = Get-Module -Name Posh-Git -ListAvailable
+    if($GitModule | select version | where version -le ([version]"0.6.1.20160330")){
+        Import-Module Posh-Git > $null
+    }
+    if(-not ($GitModule) ) {
+        Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart cmder."
+    }
+    # Make sure we only run once by alawys returning true
+    return $true
+}
+
+function checkGit($Path) {  
+    if (Test-Path -Path (Join-Path $Path '.git') ) {
+      if($env:gitLoaded -eq 'false') {
+        $env:gitLoaded = Import-Git
+      }
+
+      if (getGitStatusSetting -eq $true) {
+        Write-VcsStatus
+      }
+
+      return
+    }
+    $SplitPath = split-path $path
+    if ($SplitPath) {
+        checkGit($SplitPath)
+    }
+}
+
+function getGitStatusSetting() {
+    $gitStatus = (git --no-pager config -l) | out-string
+
+    ForEach ($line in $($gitStatus -split "`r`n")) {
+        if ($line -match 'cmder.status=false' -or $line -match 'cmder.psstatus=false') {
+            return $false
+        }
+    }
+
+    return $true
+}
--- a/vendor/sources.json
+++ b/vendor/sources.json
@ -1,22 +1,22 @@
 [
    {
        "name": "git-for-windows",
-        "version": "v2.21.0.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-64-bit.7z.exe"
+        "version": "v2.29.1.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.29.1.windows.1/PortableGit-2.29.1-64-bit.7z.exe"
    },
    {
        "name": "clink",
-        "version": "0.4.9",
-        "url": "https://github.com/mridgers/clink/releases/download/0.4.9/clink_0.4.9.zip"
+        "version": "1.1.10",
+        "url": "https://github.com/chrisant996/clink/releases/download/v1.1.10/clink.1.1.10.125c9f.zip"
    },
    {
        "name": "conemu-maximus5",
-        "version": "180626",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.06.26/ConEmuPack.180626.7z"
+        "version": "191012",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v19.10.12/ConEmuPack.191012.7z"
    },
    {
        "name": "clink-completions",
-        "version": "0.3.3",
-        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.3.zip"
+        "version": "0.3.6",
+        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.6.zip"
    }
 ]
Author	SHA1	Message	Date
Dax T Games	9c9eac1875	Merge pull request #2449 from daxgames/alias_fix Alias fix	2020-12-23 07:55:52 -05:00
dgames	ae0b7722ed	CHANGELOG.md	2020-12-23 07:55:16 -05:00
dgames	bb2f89d044	CHANGELOG.md	2020-12-23 07:33:12 -05:00
dgames	24cad3ed5c	fix 'alias ..=cd ..' removing 2 char aliases	2020-12-23 07:30:47 -05:00
dgames	ae7ddb7f86	Merge branch 'master' of https://github.com/cmderdev/cmder	2020-12-23 07:29:36 -05:00
Dax T Games	e0b8ebc669	Clink fork fixes (#2441 ) * debug * remove debug * Switch to chrisant996 Clink 1.1.8 * Update to Clink 1.1 10 * CHANGELOG.md Co-authored-by: dgames <dgames@dtg.local>	2020-12-21 21:30:30 +00:00
Vladimir Kotikov	00b22ea79a	Update clink-completions to 0.3.6 (#2440 ) https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.6	2020-12-17 10:26:59 +00:00
dgames	eb8e470fe3	Merge branch 'master' of https://github.com/cmderdev/cmder	2020-12-11 05:52:31 -05:00
Dax T Games	9088a5e2e6	Merge pull request #2430 from qfp64/faster-init Improve init speed	2020-12-11 05:48:07 -05:00
Dax T Games	25bc575e8a	Merge pull request #2390 from daxgames/sysinfo add systeminfo.exe output to cmder_diag.*	2020-12-11 05:42:22 -05:00
dgames	0ff3b391f1	Merge branch 'master' of https://github.com/cmderdev/cmder into master	2020-12-11 03:47:19 -05:00
Kyle McInnes	11a78a8d64	Fix errors	2020-12-10 13:35:40 +00:00
Kyle McInnes	2a9a4d2860	Speed up calls to lib_console	2020-12-07 19:41:11 +00:00
dgames	4874e78953	remove debug	2020-12-06 10:56:58 -05:00
dgames	f4988480f6	debug	2020-12-06 09:23:23 -05:00
Alex Kostyukov	44f5095047	fix docs for user-aliases.cmd #2397 (#2398 )	2020-10-27 17:32:05 +00:00
Florian Schwalm	2205461943	Update git for windows to 2.29.1 (#2410 )	2020-10-27 17:31:19 +00:00
Dax T. Games	467b4d4ad9	hide possible file write conflict	2020-09-13 08:27:10 -04:00
Dax T. Games	ea6e18c834	hide possible file write confilct	2020-09-13 08:02:46 -04:00
Dax T. Games	4378741aad	add systeminfo.exe output	2020-09-12 06:10:41 -04:00
Dax T Games	6458199812	Merge pull request #2380 from daxgames/fix_git_not_expected Fix `\Git\cmd\git.exe" found." was unexpected at this time.`	2020-08-31 19:11:19 -04:00
Dax T. Games	d1adf16fa8	'fixes'	2020-08-24 20:27:56 -04:00
Dax T. Games	cda883bc39	add setlocal	2020-08-23 08:47:20 -04:00
Dax T. Games	b1ef763922	add setlocal	2020-08-23 08:42:58 -04:00
Dax T Games	2cd7632720	Merge pull request #2376 from MMShep97/update-readme-links Update readme links	2020-08-15 09:02:51 -04:00
mshepherd	92169c1295	Deletes link to non-existent repo :(	2020-08-14 17:57:50 -05:00
mshepherd	e0aba11018	Updates readme link to correct path Fixes capitalization Fixes opt to be bin Updates readme link to correct path	2020-08-14 17:47:24 -05:00
Dax T Games	e8fe522a99	Merge pull request #2372 from cmderdev/revert-2371-revert-2369-fix-powershell-prompt Revert "Revert "Update profile.ps1""	2020-08-13 12:19:36 -04:00
Dax T Games	937874f03c	Revert "Revert "Update profile.ps1""	2020-08-13 07:29:24 -04:00
Dax T Games	9e085f5938	Merge pull request #2371 from cmderdev/revert-2369-fix-powershell-prompt Revert "Update profile.ps1"	2020-08-13 07:09:20 -04:00
Dax T Games	829a65f552	Revert "Update profile.ps1"	2020-08-13 07:08:20 -04:00
Dax T Games	93b69798f4	Merge pull request #2369 from mcnubblet/fix-powershell-prompt Update profile.ps1	2020-08-13 06:48:01 -04:00
mcnubblet	3f6aa3b348	Update profile.ps1 Set utf-8 BOM in profile.ps1 to fix incorrect prompt display in PowerShell	2020-08-13 14:05:49 +10:00
Dax T Games	a1785415fd	Merge pull request #2359 from daxgames/changelog Changelog	2020-07-29 20:43:32 -04:00
Dax T. Games	794ae2ad60	changelog	2020-07-29 20:42:14 -04:00
Dax T. Games	28c416a15c	changelog	2020-07-29 20:41:29 -04:00
Dax T. Games	70aa573111	changelog	2020-07-29 20:39:37 -04:00
Dax T Games	4cacd2fdc8	Merge pull request #2358 from FloSchwalm/update-to-git-2.28 Update git for windows to 2.28.0	2020-07-29 20:28:25 -04:00
Dax T Games	80f76ad956	Merge pull request #2357 from FloSchwalm/fix-git-version-comparison Fix git version comparison	2020-07-29 20:27:23 -04:00
Dax T Games	906bb5d357	Merge pull request #2339 from daxgames/fix_global_vars_vscode_err 1.3.16-pre: 1.3.15 Fixes	2020-07-29 19:33:12 -04:00
Florian Schwalm	29d784b2b1	Update git for windows to 2.28.0	2020-07-29 22:58:30 +02:00
Florian Schwalm	fc90722faa	Prepend %GIT_INSTALL_ROOT%\cmd to path instead of appending it The default setting for path enhancing is appending, so the provided unix tools don't overwrite windows tools we may want to keep. For Git this is undesired behavior, though, as we just compared git versions to decide which one we want to use. The git directory thus needs to be prepended to the path to make sure a call to git uses the version we selected.	2020-07-29 22:48:01 +02:00
Florian Schwalm	167c49ee6d	Rewrite old calls to :verbose_output to working %lib_console% verbose_output	2020-07-29 22:46:35 +02:00
Florian Schwalm	0ed10e5e89	Reorder if-else-clauses in :compare_git_versions so last else block can be reached It is hard to spot without the brackets, but the last else block - that resets %test_dir% and logs in verbose mode that an older user git version will be ignored - can't actually be reached. The else block is considered to belong to the if clause "if exist "%test_dir:~0,-4%\cmd\git.exe"" that will only ever be executed if ERRORLEVEL is greather than or equal to 0, thus if the test fails, the following else if clause "else if ERRORLEVEL 0" will always succeed and the last else block will be ignored. Using the vendored git version may still have worked because %GIT_INSTALL_ROOT% isn't set either way, but to enable the log message I reordered if-else-clauses and brackets in the way I think the original author intended them to work.	2020-07-29 22:39:46 +02:00
Florian Schwalm	cd50db3a7f	Use ERRORLEVEL instead of %errorlevel% to compare git versions %errorlevel% was always 0, even if the vendored git version was more current than the installed one Usually exiting a batch script with "exit /b exitCode" as used in :compare_versions sets %errorlevel% to the specified exit code However, this may not work if %errorlevel% was set before with "Set errorlevel=" I didn't find the location where this might have happened, but I saw the consequence of %errorlevel% always being 0 Thus I decided to use ERRORLEVEL instead as this will always work regardless of environment variable For more information check https://ss64.com/nt/errorlevel.html	2020-07-29 22:25:49 +02:00
Dax T. Games	37a223b449	fix lib_path	2020-07-25 05:11:34 -04:00
Dax T Games	334838c079	Update init.bat	2020-07-24 08:34:45 -04:00
Dax T. Games	0c3d89925e	'fix	2020-07-23 13:41:10 -04:00
Dax T. Games	020661af95	Merge branch 'fix_global_vars_vscode_err' of https://github.com/daxgames/cmder into fix_global_vars_vscode_err	2020-07-23 13:39:46 -04:00
Dax T. Games	79261d4d27	fix	2020-07-23 13:36:50 -04:00
Dax T Games	7326a3cfc5	Update init.bat	2020-07-23 13:34:13 -04:00
Dax T Games	fdcbd6df87	Delete vscode_init_args.cmd	2020-07-23 08:43:09 -04:00
Dax T Games	0c41d5f5d4	Merge pull request #2351 from famoses/patch-1 quote time measures for timer.cmd	2020-07-18 08:58:53 -04:00
famoses	40c58417b2	quote time measures for timer.cmd The startup time duration is calculated wrongly ( at least for me, on Windows 1909, with CmderMini 1.3.15.1010 ). I got something like "Elapsed Time: 80:36:1.00 (290161.00s total)" printed into the cmder consle window. I can be solved by quoting the time measures taken in `init.bat`. It seems that `time.cmd` fails in recognizing two arguments. In fact it did split the first time measure into two arguments and ignored the second time measure. Example: from the two time measures λ echo %CMDER_INIT_START% %CMDER_INIT_END% 12:53:44,34 12:53:54,04 The call to `time.cmd` created following output (i added echo commands to print variables start and end right after they got assigned the arguments) start: 12:53:44 end: 34	2020-07-18 13:32:22 +02:00
Dax T. Games	97a41ddd99	fix cmder_configured GTR 1	2020-07-14 22:31:57 -04:00
Dax T. Games	954937cf97	cleanup	2020-07-05 15:22:09 -04:00
Dax T. Games	2c620d1d67	cleanup	2020-07-05 15:13:23 -04:00
Dax T. Games	5e7a7029d1	make vscode_init.cmd smart enough to apply cmder settings if launched from inside or outside cmder	2020-07-04 14:23:16 -04:00
Dax T. Games	f1c1354c00	make vscode_init.cmd smart enough to apply cmder settings if launched from inside or outside cmder	2020-07-04 13:43:18 -04:00
Dax T Games	0f12de345b	Update init.bat	2020-07-02 07:00:25 -04:00
Dax T. Games	c332ab1a34	Fix bug introduced in 1.3.15	2020-07-01 16:24:36 -04:00
Dax T Games	4403edb110	Update init.bat	2020-07-01 08:26:44 -04:00
Dax T. Games	00bc5439fd	Merge branch 'fix_git' into fix_global_vars_vscode_err	2020-06-29 07:51:31 -04:00
Dax T. Games	da5f1bc4db	fix git detect	2020-06-29 07:49:22 -04:00
Dax T. Games	52f5ad62c3	changelog	2020-06-26 22:29:26 -04:00
Dax T. Games	250ae06e7a	fix vscode terminal errors when setting cmder fast_init=1 outside cmder	2020-06-26 22:27:29 -04:00
Dax T Games	bc7984769c	Merge pull request #2338 from daxgames/master CHANGELOG.md	2020-06-26 16:49:35 -04:00
Dax T. Games	130dc750be	CHANGELOG.md	2020-06-26 16:45:21 -04:00
Dax T Games	c6edbc0068	Merge pull request #2311 from daxgames/fix_path_enh_recurs Fix and enhance enhance_path_recursive	2020-06-26 16:27:42 -04:00
Dax T Games	c0eeec6608	Merge pull request #2335 from kvittokonito/custom_window_icons Added support for setting custom icons for Cmder window	2020-06-26 16:25:34 -04:00
Gaizka P	ee25dbaab6	Removed leftover debug text in error message box.	2020-06-24 07:25:30 +02:00
Gaizka P	e9f20aea91	Added build configurations for x64.	2020-06-24 03:01:54 +02:00
Gaizka P	29aa75e158	Added support for setting custom icons for Cmder window.	2020-06-24 03:01:22 +02:00
Dax T Games	8781779636	Update init.bat If CMDER_CONFIGURED==1 skip to :CMDER_CONFIGURED	2020-06-09 19:41:08 -04:00
Dax T Games	31c019b7e4	Update init.bat Move skip to user config below clink enablement in cmder_configured == 1	2020-06-08 21:18:23 -04:00
Dax T Games	4d86559841	Update init.bat Remove cmder_configured goto	2020-06-08 21:03:41 -04:00
Dax T Games	a5dcf9c260	Merge pull request #2323 from SVijayB/Broken-links Update README.md	2020-06-07 15:52:46 -04:00
Dax T. Games	a999d17f71	Allow setting cmder init.bat arg vars globally on windows.	2020-06-07 15:32:15 -04:00
Dax T. Games	04c784cb16	Allow setting cmder init.bat arg vars globally on windows.	2020-06-07 14:49:02 -04:00
Vijay	a2ce74f981	Update README.md	2020-05-25 00:27:53 +05:30
Dax T. Games	b91bb84f3d	fix cexec.cmd	2020-05-10 10:56:12 -04:00
Dax T Games	35ace106c8	Merge pull request #2308 from wtof1996/update-git Update git for windows to 2.26.2	2020-04-29 13:42:43 -04:00
Dax T. Games	1861983469	readme	2020-04-29 13:40:39 -04:00
Dax T. Games	1f5ea5e596	Fix and enhance enhance_path_recursive	2020-04-29 12:03:24 -04:00
wtof	2936abe2a5	Update git for windows to 2.26.2	2020-04-28 11:18:24 +08:00
Dax T Games	c9bc1f6b83	Merge pull request #2294 from daxgames/1.3.15 Fix Cmder issue #2290	2020-04-06 10:18:26 -04:00
Dax T. Games	be5ec648c4	Fix Cmder issue #2290	2020-04-06 10:15:00 -04:00
Dax T Games	ab3639540f	Merge pull request #2293 from daxgames/1.3.15 1.3.15-pre	2020-04-06 08:50:15 -04:00
Dax T Games	2517f55f15	Merge branch 'master' into 1.3.15	2020-04-06 08:48:19 -04:00
Dax T. Games	1af12666e4	move git functions to git lib	2020-04-06 08:46:46 -04:00
Dax T. Games	93f8718489	move git functions to git lib	2020-04-06 08:20:26 -04:00
Michael Roy	1071221468	Fix an issue with clink.find_files() return order not always consistent, leading to .init.lua not being run first lua path being broken (#2278 )	2020-03-14 13:01:06 +00:00
Dax T Games	a92bb1947f	Merge pull request #2265 from andyburgess/master Fixes #2247, fixes #2254	2020-03-05 21:22:08 -05:00
andyburgess	251968b4c6	Fixes #2247 , fixes #2254	2020-02-21 11:52:52 -05:00
Dax T Games	638d82e989	Update CHANGELOG.md	2020-01-08 21:43:09 -05:00
Dax T Games	0e37a4c2f9	Merge pull request #2222 from daxgames/1.3.14 1.3.14	2020-01-08 21:34:19 -05:00
Dax T. Games	ca2550b70e	Fix issue #2214	2020-01-06 23:03:11 -05:00
Dax T. Games	492fc284f2	Fix issue #2214	2020-01-06 22:57:29 -05:00
Dax T. Games	ec06f3e39b	changelog	2020-01-06 22:50:03 -05:00
Dax T Games	850e4ec045	Merge pull request #2237 from jrappen/patch-1 Bump git-for-windows to v2.24.1.windows.2	2020-01-06 22:40:49 -05:00
Johannes Rappen	fe3d2034ef	Bump git-for-windows to v2.24.1.windows.2	2020-01-06 22:45:17 +01:00
Dax T. Games	180e72a6aa	revert --no-log to fix windows 7 clink prompt	2020-01-05 13:52:23 -08:00
Dax T. Games	93cf865071	post-install fixes	2020-01-05 16:41:02 -05:00
Dax T Games	b41aac982c	Merge pull request #2223 from vladimir-kotikov/patch-6 Update clink-completions	2019-12-05 13:23:36 -05:00
Vladimir Kotikov	8df688bada	Update clink-completions https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.5	2019-12-05 10:53:32 +03:00
Dax T. Games	84917159ec	fixes for cmd:cmder init script	2019-12-04 16:14:36 -05:00
Dax T. Games	750560851f	fixes for cmd:cmder init script	2019-12-04 16:13:08 -05:00
Dax T. Games	9b29668250	fixes for cmd:cmder init script	2019-12-04 16:09:38 -05:00
Dax T. Games	a857d8419c	fixes for cmd:cmder init script	2019-12-04 16:04:16 -05:00
Dax T. Games	0cf1c5e2eb	fix	2019-11-23 18:13:03 -05:00
Dax T Games	ddec3e8425	Merge pull request #2212 from daxgames/goo_per_shell dd per shell git opt out	2019-11-23 11:59:25 -05:00
Dax T. Games	2428e8529f	dd per shell git opt out	2019-11-23 11:54:53 -05:00
Dax T Games	3eb82d4095	Merge pull request #2203 from daxgames/conemu191012 update conemu to 19.10.12	2019-11-19 17:21:05 -05:00
Dax T. Games	589b48d06e	update conemu	2019-11-09 17:50:57 -05:00
Dax T Games	67f35bc05d	Merge pull request #2199 from daxgames/git_opt_out Git opt out	2019-11-09 17:03:07 -05:00
Dax T. Games	9724151f06	allow git prompt status opt out for powershell and bash	2019-11-09 16:40:55 -05:00
Dax T. Games	c04cc6dc7f	allow git prompt status opt out for powershell and bash	2019-11-09 16:39:57 -05:00
Dax T. Games	3ee244e4c1	allow git prompt status opt out for powershell and bash	2019-11-09 16:36:16 -05:00
Dax T. Games	44bc089ee4	move lambda to cmder prompt method for easier user change	2019-11-03 14:14:47 -05:00
Dax T. Games	6ab4599a4d	separate powershell functions from profile.ps1	2019-11-03 13:07:20 -05:00
Dax T. Games	dac4b27e28	separate powershell functions from profile.ps1	2019-11-03 12:59:36 -05:00
Dax T. Games	661f59d0fb	Fix #2191 profile.ps1: CheckGit does not export $gitLoaded	2019-11-03 12:36:28 -05:00
Dax T. Games	5a6f873d2b	README.md	2019-11-03 11:29:18 -05:00
Dax T. Games	788d4e0caa	README.md	2019-11-03 11:28:18 -05:00
Dax T. Games	f1fbd98093	README.md	2019-11-03 11:25:02 -05:00
Dax T. Games	74fcb5b62b	README.md	2019-11-03 11:23:37 -05:00
Dax T. Games	60279fea04	README.md	2019-11-03 11:22:29 -05:00
Dax T. Games	7877d417f8	changelog	2019-11-03 11:13:55 -05:00
Dax T. Games	44a8bf5802	add ability to disable git	2019-11-03 11:00:27 -05:00
Dax T Games	b70a03cde0	Merge pull request #2194 from daxgames/fix_path_with! Fix path with ! in cmder_root dir path	2019-11-01 17:19:03 -04:00
Dax T. Games	8cf51e454a	CHANGELOG.md	2019-10-27 17:06:02 -04:00
Dax T. Games	f1b1ac0ec1	CHAMGELOG.md	2019-10-27 16:57:28 -04:00
Dax T. Games	06b0c0d3c2	cleanup	2019-10-27 16:43:51 -04:00
Dax T Games	f1a9721256	Update init.bat	2019-10-22 22:44:17 -04:00
Dax T Games	46c8099317	Update CHANGELOG.md	2019-10-22 22:41:44 -04:00
Dax T Games	f44c68273b	Merge pull request #2193 from glucas/fix/2192 Fix #2192: Set default prompt hooks before loading user profile	2019-10-22 21:45:32 -04:00
Greg Lucas	7f69f15637	Fix #2192 : Set default prompt hooks before loading user profile	2019-10-22 11:17:13 -04:00
David Refoua	3736508b2c	Update template issue (#2189 ) * fix unclear guide * m. update	2019-10-14 19:37:55 +02:00
Benjamin Staneck	4575ac3209	⬆️ Update ConEmu to 190714 Release Notes: https://conemu.github.io/en/Whats_New.html	2019-10-12 19:45:23 +02:00
Benjamin Staneck	035f209bc4	⬆️ Update Git to 2.23.0 Release Notes: https://github.com/git-for-windows/git/releases/tag/v2.23.0.windows.1	2019-10-12 19:43:46 +02:00
mdavis199	e4651cf7b4	Bare doubledash for conemu commands (#2174 ) * Add bare doubledash command line option The '--' parameter is a common POSIX-style option. All command-line parameters after the double dash will be joined by a space and forwarded to conemu. * add bare doubledash command line option The "--" option indicates that the remaining portion of the command line is forwarded to conemu. Quotes and spacing is retained. * move all doubledash related code together * remove unused variable	2019-10-06 21:52:50 +01:00
Dax T Games	19a2fd11e3	Clink Completions 0.3.4 (#2177 ) * update Changelog, clink-completions 0.3.4, fix ps fg color * Update CHANGELOG.md * Update CHANGELOG.md	2019-09-28 02:21:47 +02:00
Dax T Games	feee4eaed2	Merge pull request #2153 from mcovalt/clink_nolog Disable clink logging	2019-09-14 09:13:04 -04:00
Matt Covalt	b310a2c47c	Disable clink logging	2019-08-29 12:48:52 -04:00
Dax Games	22afc40a08	cleanup	2019-08-22 06:27:39 -04:00
Dax Games	c499456f97	cleanup	2019-08-22 06:24:49 -04:00
Dax Games	34468ef2fd	cleanup	2019-08-22 06:20:19 -04:00
Dax Games	5cb8021864	Merge branch 'fix_path_with!' of https://github.com/daxgames/cmder into fix_path_with!	2019-08-22 06:11:18 -04:00
Dax T. Games	468dba474e	fixes	2019-10-13 15:47:25 -04:00
Dax T. Games	db42252ef2	cleanup	2019-10-13 10:18:04 -04:00
Dax T. Games	57b328b209	cleanup	2019-10-13 10:15:26 -04:00
Dax T. Games	05836e761e	merge	2019-10-13 10:11:38 -04:00
Dax T. Games	e8b33aa45b	Merge branch 'master' of https://github.com/cmderdev/cmder into fix_path_with!	2019-10-13 10:11:25 -04:00
Dax T. Games	377d97e56a	fix path with ! in dir	2019-10-13 10:07:23 -04:00
Dax T. Games	3a44bc809d	add ~ match to vendor/clink.lua/	2019-09-27 18:17:24 -04:00
Dax T. Games	45e5600249	update Changelog, clink 0.3.4, fix ps fg color	2019-09-26 18:07:25 -04:00