Fix GIT_INSTALL_ROOT again

release notes: https://conemu.github.io/en/Whats_New.html

.github/issue_template.md

@@ -0,0 +1,78 @@
+<!--
+
+  Thank you for reporting a bug for the Cmder project!
+  ------------------------------------------------------------------
+  
+  Please make sure you read and follow the following instructions
+  carefully before reporting bugs, and/or requesting new features.
+  
+  Make sure that you have:
+  
+  • Searched for existing issues (including the **closed** ones)
+    for the similar problems here:
+    https://github.com/cmderdev/cmder/issues?q=is:issue
+    
+  • Read the README.md and the Wiki:
+    - https://github.com/cmderdev/cmder/blob/master/README.md
+    - https://github.com/cmderdev/cmder/wiki
+    
+    (What you may be asking here could already be explained there!)
+    
+  • Please understand that Cmder by default uses ConEmu as the
+    underlying Terminal Emulator. If your issue is regarding
+    the **Terminal Emulator**, please visit the ConEmu issues page:
+    
+    https://github.com/Maximus5/ConEmu/issues?q=is:issue
+    
+    If there isn't an existing issue, you may open a new one there.
+    
+    (We don't resolve issues regarding ConEmu here, so please 
+     make sure you open the issue in the correct place.)
+
+    more info: https://conemu.github.io/en/ThirdPartyProblems.html
+     
+  • If you are asking for guides on how to integrate Cmder into
+    your favorite IDE of choice, or how to perform an specific
+    task with Cmder, make sure you visit our label section first!
+    You may already have an answer under the Guides or Questions section.
+
+    For a list of labels, visit:
+    - https://github.com/cmderdev/cmder/labels
+
+    (Be sure to also check “Closed” issues in the labels section!)
+     
+  • If the issue is regarding the other upstream technologies that
+    Cmder uses (e.g. Clink, Git, etc), please make sure that the
+    bug you are reporting only applies when they are used in
+    combination with Cmder. If the bug applies when the mentioned
+    tools are NOT used within Cmder, there's a good chance that
+    you should open the bug at the corresponding repo instead.
+
+    Read more on about Cmder on ConEmu docs:
+    https://conemu.github.io/en/cmder.html
+    
+    
+  Thank you for making sure you are opening a new valid issue!
+  
+-->
+
+<!-- 
+  Some tips on how to write a better report:
+  - Put an `x` into all the boxes [ ] relevant to your issue (example: [x]).
+  - Use the *Preview* tab to see how your issue will actually look like, before sending it.
+  - 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.
+    Help us reproduce the issue by explaining what went wrong, and what did you expect to happen.
+  - Please keep the ticket language to English only here.
+    We can't process your issue if it's written in Russian or Chinese as we can't understand them.
+  - ⚠ Read the following page to avoid posting a bad issue: https://conemu.github.io/en/BadIssue.html
+-->
+
+### Purpose of the issue
+- [ ] Bug report (encountered problems/errors)
+- [ ] Feature request (request for new functionality)
+- [ ] Question
+
+### Description of the issue 
+<!-- Provide a clear, simple description of your issue here -->

.gitignore

@@ -2,6 +2,7 @@
 ## Those files should be taken from their repositary
 
 vendor/*/*
+!vendor/lib/*
 !vendor/*
 !vendor/psmodules/PsGet
 

README.md

@@ -10,6 +10,8 @@ Cmder is a **software package** created out of pure frustration over absence of
 
 The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies, which makes it great for **USB Sticks** or **cloud storage**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.
 
+The Cmder's user interface is also designed to be more eye pleasing, and you can compare the main differences between Cmder and ConEmu [here](https://conemu.github.io/en/cmder.html).
+
 ## Installation
 ### Single User Portable Config
 
@@ -79,7 +81,7 @@ In a file explorer window right click in or on a directory to see "Cmder Here" i
 * <kbd>Ctrl</kbd> + <kbd>R</kbd> : History search
 * <kbd>Shift</kbd> + Mouse : Select and copy text from buffer
 
-(Some shortcuts are not yet documented, though they exist - please document them here)
+_(Some shortcuts are not yet documented, though they exist - please document them here)_
 
 ## Features
 
@@ -88,7 +90,7 @@ You can open multiple tabs each containing one of the following shells:
 
 | Task                | Shell          | Description                                                                                                  |
 | ----                | -----          | -----------                                                                                                  |
-| Cmder               | cmd.exe        | Windows 'cmd.exe' shell enhanced with Git, Git aware prompt, Clink(GNU Readline), and Aliases.               |
+| 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 .                                                  |
 | PowerShell as Admin | powershell.exe | Administrative Windows 'powershell.exe' Cmder shell.                                                         |
@@ -99,9 +101,13 @@ You can open multiple tabs each containing one of the following shells:
 
 Cmder, PowerShell, and Bash tabs all run on top of the Windows Console API and work as you might expect in Cmder with access to use ConEmu's color schemes, key bindings and other settings defined in the ConEmu Settings dialog.
 
-Mintty tabs use a program called 'mintty' as the terminal that is not based on the Windows Console API so some differences in functionality are normal, as a result mintty specific config is done via the '[%USERPROFILE%|$HOME]/.minttyrc' file.
+⚠ *NOTE:* Only the full edition of Cmder comes with a pre-installed bash, using a vendored [git-for-windows](https://gitforwindows.org/) installation. The pre-configured Bash tabs may not work on Cmder mini eidition without additional configuration.
 
-Mintty differs from the other tabs in that it supports xterm/xterm-256color TERM types, and does not work with ConEmu settings like color schemes and key bindings. For more on Mintty and its config click [here](https://github.com/mintty/mintty).
+You may however, choose to use an external installation of bash, such as Microsoft's [Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10) (called WSL) or the [Cygwin](https://cygwin.com/) project which provides POSIX support on windows.
+
+⚠ *NOTE:* Mintty tabs use a program called 'mintty' as the terminal emulator that is not based on the Windows Console API, rather it's rendered graphically by ConEmu. Mintty differs from the other tabs in that it supports xterm/xterm-256color TERM types, and does not work with ConEmu settings like color schemes and key bindings.  As such, some differences in functionality are to be expected, such as Cmder not being able to apply a system-wide configuration to it. 
+
+As a result mintty specific config is done via the '[%USERPROFILE%|$HOME]/.minttyrc' file.  You may read more about Mintty and its config file [here](https://github.com/mintty/mintty).
 
 An example of setting Cmder portable terminal colors for mintty:
 
@@ -114,6 +120,8 @@ 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).
+
 ### Changing Cmder Default 'cmd.exe' Shell Startup Behaviour Using Task Arguments
 
 1. Press <kbd>Win</kbd> + <kbd>Alt</kbd> + <kbd>T</kbd>
@@ -160,7 +168,6 @@ You can write *.cmd|*.bat, *.ps1, and *.sh scripts and just drop them in the %CM
 | PowerShell    | $ENV:CMDER_ROOT\\config\\profile.d\\\*.ps1        |
 | Bash/Mintty   | $CMDER_ROOT/config/profile.d/*.sh                 |
 
-
 ### 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`.
@@ -212,7 +219,9 @@ Cmder is by default shipped with a vendored Git installation.  On each instance
 
 You may use your favorite version of Git by including its path in the `%PATH%` enviroment variable.  Moreover, the **Mini** edition of Cmder (found on the [downloads page](https://github.com/cmderdev/cmder/releases)) excludes any vendored Git binaries.
 
-### Using external Cygwin/Babun, MSys2, or Git for Windows SDK with Cmder.
+### Using external Cygwin/Babun, MSys2, WSL, or Git for Windows SDK with Cmder.
+
+You may run bash (the default shell used on Linux, macOS and GNU/Hurd) externally on Cmder, using the following instructions:
 
 1. Setup a new task by pressing '<kbd>Win</kbd> +<kbd>Alt</kbd> + <kbd>T</kbd>'.
 1. Click the '+' button to add a task.
@@ -220,7 +229,7 @@ You may use your favorite version of Git by including its path in the `%PATH%` e
 1. Provide task parameters, this is optional.
 1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console``` to the `Commands` text box.
 
-Recommended Optional Steps:
+**Recommended Optional Steps:**
 
 Copy the 'vendor/cmder_exinit' file to the Cygwin/Babun, MSys2, or Git for Windows SDK environments ```/etc/profile.d/``` folder to use portable settings in the $CMDER_ROOT/config folder.
 
@@ -237,9 +246,16 @@ Uncomment and edit the below line in the script to use Cmder config even when la
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
 ```
 
+### Integrating Cmder with [Hyper](https://github.com/zeit/hyper), [Microsoft VS Code](https://code.visualstudio.com/), and your favorite IDEs 
+Cmder by default comes with a vendored ConEmu installation as the underlying terminal emulator, as stated [here](https://conemu.github.io/en/cmder.html).
+
+However, Cmder can in fact run in a variety of other terminal emulators, and even integrated IDEs. Assuming you have the latest version of Cmder, follow the following instructions to get Cmder working with your own terminal emulator.
+
+For instructions on how to integrate Cmder with your IDE, please read our [Wiki section](https://github.com/cmderdev/cmder/wiki#cmder-integration).
+
 ## Upgrading
 
-The process of upgrading Cmder depends on the version/build you are currently running
+The process of upgrading Cmder depends on the version/build you are currently running.
 
 If you have a `[cmder_root]/config/user-conemu.xml`, you are running a newer version of Cmder, follow the below process: 
 

config/ConEmu.xml

@@ -59,6 +59,7 @@
 			<value name="FadeInactive" type="hex" data="01"/>
 			<value name="FadeInactiveLow" type="hex" data="00"/>
 			<value name="FadeInactiveHigh" type="hex" data="c8"/>
+			<value name="ComSpec.UncPaths" type="hex" data="01"/>
 			<value name="ConVisible" type="hex" data="00"/>
 			<value name="ConInMode" type="dword" data="ffffffff"/>
 			<value name="UseInjects" type="hex" data="01"/>
@@ -484,7 +485,7 @@
 			<value name="DndRKey" type="hex" data="a2"/>
 			<value name="WndDragKey" type="dword" data="00121101"/>
 			<key name="Tasks" modified="2018-02-22 06:02:12" build="171109">
-				<value name="Count" type="long" data="8"/>
+				<value name="Count" type="long" data="9"/>
 				<key name="Task1" modified="2018-02-22 06:02:12" build="171109">
 					<value name="Name" type="string" data="{cmd::Cmder as Admin}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
@@ -504,7 +505,7 @@
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
 				<key name="Task3" modified="2018-02-22 06:05:13" build="171109">
-					<value name="Name" type="string" data="{Powershell::PowerShell as Admin}"/>
+					<value name="Name" type="string" data="{PowerShell::PowerShell as Admin}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
 					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
@@ -513,11 +514,11 @@
 					<value name="Flags" type="dword" data="00000000"/>
 				</key>
 				<key name="Task4" modified="2018-02-22 06:05:13" build="171109">
-					<value name="Name" type="string" data="{Powershell::Powershell}"/>
+					<value name="Name" type="string" data="{PowerShell::PowerShell}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
 					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
-					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe"/>
+					<value name="Cmd2" type="string" data="&quot;%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe&quot;"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
 					<value name="Flags" type="dword" data="00000000"/>
@@ -527,7 +528,7 @@
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l"/>
+					<value name="Cmd1" type="string" data="*&quot;%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe&quot; /bin/bash -l"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
 				</key>
@@ -536,10 +537,10 @@
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
-					<value name="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l"/>
+					<value name="Cmd1" type="string" data="&quot;%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe&quot; /bin/bash -l"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
-					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l"/>
+					<value name="Cmd2" type="string" data="&quot;%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe&quot; /bin/bash -l"/>
 				</key>
 				<key name="Task7" modified="2018-02-22 06:05:13" build="171109">
 					<value name="Name" type="string" data="{bash::bash as Admin}"/>
@@ -548,14 +549,23 @@
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
-					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot;"/>
+					<value name="Cmd1" type="string" data="*cmd /c &quot;&quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i&quot;"/>
 				</key>
 				<key name="Task8" modified="2018-02-22 06:05:13" build="171109">
 					<value name="Name" type="string" data="{bash::bash}"/>
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot;"/>
+					<value name="Cmd1" type="string" data="cmd /c &quot;&quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i&quot;"/>
+					<value name="Active" type="long" data="0"/>
+					<value name="Count" type="long" data="1"/>
+				</key>
+				<key name="Task9" modified="2018-03-23 23:26:53" build="180318">
+					<value name="Name" type="string" data="{WSL::bash}"/>
+					<value name="Flags" type="dword" data="00000000"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
+					<value name="GuiArgs" type="string" data='-icon "%USERPROFILE%\AppData\Local\lxss\bash.ico"'/>
+					<value name="Cmd1" type="string" data='set "PATH=%ConEmuBaseDirShort%\wsl;%PATH%" &amp; %ConEmuBaseDirShort%\conemu-cyg-64.exe --wsl -cur_console:pm:/mnt'/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
 				</key>

launcher/CmderLauncher.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -14,6 +14,7 @@
     <ProjectGuid>{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CmderLauncher</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -25,9 +26,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -60,6 +61,9 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
     <ResourceCompile>
       <PreprocessorDefinitions>_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
@@ -83,6 +87,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
     <PostBuildEvent>
       <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
     </PostBuildEvent>
@@ -101,4 +108,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

launcher/src/CmderLauncher.cpp

@@ -5,8 +5,8 @@
 #include <vector>
 #include <shlobj.h>
 
-#include <regex> 
+#include <regex>
-#include <iostream> 
+#include <iostream>
 
 #pragma comment(lib, "Shlwapi.lib")
 
@@ -16,8 +16,6 @@
 
 #define USE_TASKBAR_API (_WIN32_WINNT >= _WIN32_WINNT_WIN7)
 
-#define XP (_WIN32_WINNT < _WIN32_WINNT_VISTA)
-
 #define MB_TITLE L"Cmder Launcher"
 #define SHELL_MENU_REGISTRY_PATH_BACKGROUND L"Directory\\Background\\shell\\Cmder"
 #define SHELL_MENU_REGISTRY_PATH_LISTITEM L"Directory\\shell\\Cmder"
@@ -140,7 +138,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			{
 				MessageBox(NULL,
 					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location! Restart Cmder as administrator."
+					? L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location! Restart Cmder as Administrator."
 					: L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location!", MB_TITLE, MB_ICONSTOP);
 				exit(1);
 			}
@@ -151,12 +149,11 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			{
 				MessageBox(NULL,
 					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location! Restart Cmder as administrator."
+					? L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location! Restart Cmder as Administrator."
 					: L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
 				exit(1);
 			}
 		}
-
 	}
 	else if (PathFileExists(userCfgPath)) {
 		if (PathFileExists(cfgPath)) {
@@ -164,7 +161,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			{
 				MessageBox(NULL,
 					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu.xml file to backup location! Restart Cmder as administrator."
+					? L"Failed to copy ConEmu.xml file to backup location! Restart Cmder as Administrator."
 					: L"Failed to copy ConEmu.xml file to backup location!", MB_TITLE, MB_ICONSTOP);
 				exit(1);
 			}
@@ -175,7 +172,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			{
 				MessageBox(NULL,
 					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as administrator."
+					? L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as Administrator."
 					: L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
 				exit(1);
 			}
@@ -186,7 +183,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		{
 			MessageBox(NULL,
 				(GetLastError() == ERROR_ACCESS_DENIED)
-				? L"Failed to copy ConEmu.xml file to user-conemu.xml backup location! Restart Cmder as administrator."
+				? L"Failed to copy ConEmu.xml file to user-conemu.xml backup location! Restart Cmder as Administrator."
 				: L"Failed to copy ConEmu.xml file to user-conemu.xml backup location!", MB_TITLE, MB_ICONSTOP);
 			exit(1);
 		}
@@ -196,7 +193,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		{
 			MessageBox(NULL,
 				(GetLastError() == ERROR_ACCESS_DENIED)
-				? L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as administrator."
+				? L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as Administrator."
 				: L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
 			exit(1);
 		}
@@ -211,13 +208,6 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
 	}
 
-	if (streqi(cmderStart.c_str(), L""))
-	{
-		TCHAR buff[MAX_PATH];
-		const DWORD ret = GetEnvironmentVariable(L"USERPROFILE", buff, MAX_PATH);
-		cmderStart = buff;
-	}
-
 	if (is_single_mode)
 	{
 		if (!streqi(cmderTask.c_str(), L"")) {
@@ -237,7 +227,6 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		}
 	}
 
-
 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
 	if (wcscmp(userConfigDirPath, configDirPath) != 0)
 	{
@@ -310,33 +299,33 @@ void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 
 	GetModuleFileName(NULL, exePath, sizeof(exePath));
 
-wchar_t commandStr[MAX_PATH + 20] = { 0 };
+	wchar_t commandStr[MAX_PATH + 20] = { 0 };
-swprintf_s(commandStr, L"\"%s\" \"%%V\"", exePath);
+	swprintf_s(commandStr, L"\"%s\" \"%%V\"", exePath);
 
-// Now that we have `commandStr`, it's OK to change `exePath`...
+	// Now that we have `commandStr`, it's OK to change `exePath`...
-PathRemoveFileSpec(exePath);
+	PathRemoveFileSpec(exePath);
 
-PathCombine(icoPath, exePath, L"icons\\cmder.ico");
+	PathCombine(icoPath, exePath, L"icons\\cmder.ico");
 
-// Now set the registry keys
+	// Now set the registry keys
-HKEY root = GetRootKey(opt);
+	HKEY root = GetRootKey(opt);
 
-HKEY cmderKey;
+	HKEY cmderKey;
-FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
+	FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
 
-FAIL_ON_ERROR(RegSetValue(cmderKey, L"", REG_SZ, L"Cmder Here", NULL));
+	FAIL_ON_ERROR(RegSetValue(cmderKey, L"", REG_SZ, L"Cmder Here", NULL));
-FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"NoWorkingDirectory", 0, REG_SZ, (BYTE *)L"", 2));
+	FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"NoWorkingDirectory", 0, REG_SZ, (BYTE *)L"", 2));
 
-FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"Icon", 0, REG_SZ, (BYTE *)icoPath, wcslen(icoPath) * sizeof(wchar_t)));
+	FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"Icon", 0, REG_SZ, (BYTE *)icoPath, wcslen(icoPath) * sizeof(wchar_t)));
 
-HKEY command;
+	HKEY command;
-FAIL_ON_ERROR(RegCreateKeyEx(cmderKey, L"command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &command, NULL));
+	FAIL_ON_ERROR(RegCreateKeyEx(cmderKey, L"command", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &command, NULL));
 
-FAIL_ON_ERROR(RegSetValue(command, L"", REG_SZ, commandStr, NULL));
+	FAIL_ON_ERROR(RegSetValue(command, L"", REG_SZ, commandStr, NULL));
 
-RegCloseKey(command);
+	RegCloseKey(command);
-RegCloseKey(cmderKey);
+	RegCloseKey(cmderKey);
-RegCloseKey(root);
+	RegCloseKey(root);
 }
 
 void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
@@ -344,11 +333,8 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 	HKEY root = GetRootKey(opt);
 	HKEY cmderKey;
 	FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
-#if XP
-	FAIL_ON_ERROR(SHDeleteKey(cmderKey, NULL));
-#else
 	FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL));
-#endif
+	RegDeleteKeyEx(root, keyBaseName, KEY_ALL_ACCESS, NULL);
 	RegCloseKey(cmderKey);
 	RegCloseKey(root);
 }
@@ -363,7 +349,6 @@ struct cmderOptions
 	bool registerApp = false;
 	bool unRegisterApp = false;
 	bool error = false;
-
 };
 
 cmderOptions GetOption()
@@ -418,7 +403,7 @@ cmderOptions GetOption()
 			cmderOptions.registerApp = true;
 			cmderOptions.unRegisterApp = false;
 			if (szArgList[i + 1] != NULL)
-			{ 
+			{
 				if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
 				{
 					cmderOptions.cmderRegScope = szArgList[i + 1];
@@ -453,6 +438,7 @@ cmderOptions GetOption()
 
 	return cmderOptions;
 }
+
 int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	_In_opt_ HINSTANCE hPrevInstance,
 	_In_ LPTSTR    lpCmdLine,
@@ -464,11 +450,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 
 	cmderOptions cmderOptions = GetOption();
 
-	if (cmderOptions.registerApp == true ) {
+	if (cmderOptions.registerApp == true) {
 		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
 		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM);
 	}
-	else if (cmderOptions.unRegisterApp == true )
+	else if (cmderOptions.unRegisterApp == true)
 	{
 		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
 		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM);
@@ -481,6 +467,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	{
 		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot);
 	}
-	
+
 	return 0;
 }

launcher/src/app.manifest

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+
+	<!-- Project description definition -->
+	<description>Cmder Console Emulator</description>
+	
+	<!-- Project dependency definition -->
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity
+				type="win32"
+				name="Microsoft.Windows.Common-Controls"
+				version="6.0.0.0" processorArchitecture="*"
+				publicKeyToken="6595b64144ccf1df"
+				language="*" />
+		</dependentAssembly>
+	</dependency>
+	
+	<!-- Win32 User Account Control definition -->
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel
+					level="asInvoker"
+					uiAccess="false" />
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	
+	<!-- Required for appcompat behaviour -->
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<!-- Windows Vista -->
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<!-- Windows 7 -->
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<!-- Windows 8 -->
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+			<!-- Windows 8.1 -->
+			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+			<!-- Windows 10 -->
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+		</application>
+	</compatibility>
+	
+	<!-- Add dpi awareness -->
+	<asmv3:application>
+		<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+			<dpiAware>true/pm</dpiAware>
+		</asmv3:windowsSettings>
+	</asmv3:application>
+	
+</assembly>

launcher/src/version.rc2.sample

@@ -0,0 +1,27 @@
+
+/**
+ * WARNING: do NOT modify this file! the content of this file should be
+ *          automatically genereted before AppVeyor builds using the
+ *          respective .ps1 Powershell scripts.
+ *
+ */
+
+/////////////////////////////////////////////////////////////////////////////
+// Define the version numbers and build information manually here:
+
+#define CMDER_MAJOR_VERSION         {Cmder-Major-Version}
+#define CMDER_MINOR_VERSION         {Cmder-Minor-Version}
+#define CMDER_REVISION_VERSION      {Cmder-Revision-Version}
+#define CMDER_BUILD_VERSION         {Cmder-Build-Version}
+#define CMDER_VERSION_STR           {Cmder-Version-Str}
+
+#define CMDER_PRODUCT_NAME_STR      "Cmder"
+#define CMDER_FILE_DESCRIPTION_STR  "Cmder: Lovely Console Emulator."
+#define CMDER_INTERNAL_NAME_STR     "Cmder"
+#define CMDER_ORIGINAL_FILENAME_STR "Cmder.exe"
+#define CMDER_COMPANY_NAME_STR      "Samuel Vasko"
+#define CMDER_COPYRIGHT_YEAR_STR    "2016"
+
+#define CMDER_DEBUGFLAG             0x0L  // set to 0x1L to enable debug mode
+#define CMDER_BUILDFLAGS            0x0L
+/////////////////////////////////////////////////////////////////////////////

packignore

@@ -2,7 +2,8 @@ launcher
 .gitignore
 .gitattributes
 .git
-*.rb
+.github
+*.md
 build
 scripts
 config\.history
@@ -19,4 +20,3 @@ appveyor.yml
 vendor\cmder.sh
 vendor\git-prompt.sh
 config\user-*
-.github_changelog_generator

scripts/build.ps1

@@ -58,12 +58,15 @@ $ScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
 $cmder_root = $ScriptRoot.replace("\scripts","")
 
 # Dot source util functions into this scope
-. ".\utils.ps1"
+. "$PSScriptRoot\utils.ps1"
 $ErrorActionPreference = "Stop"
 
 Push-Location -Path $saveTo
 $sources = Get-Content $sourcesPath | Out-String | Convertfrom-Json
 
+# Get the version string
+$version = Get-VersionStr
+
 # Check for requirements
 Ensure-Exists $sourcesPath
 Ensure-Executable "7z"
@@ -116,10 +119,17 @@ Pop-Location
 
 if($Compile) {
     Push-Location -Path $launcher
-    msbuild CmderLauncher.vcxproj /p:configuration=Release
+    Create-RC $version ($launcher + '\src\version.rc2');
+    msbuild CmderLauncher.vcxproj /t:Clean,Build /p:configuration=Release
     if ($LastExitCode -ne 0) {
         throw "msbuild failed to build the executable."
     }
+    else {
+        Write-Verbose "successfully built Cmder v$version!"
+        if ( $Env:APPVEYOR -eq 'True' ) {
+            Add-AppveyorMessage -Message "Building Cmder v$version was successful." -Category Information
+        }
+    }
     Pop-Location
 } else {
     Write-Warning "You are not building a launcher, Use -Compile"

scripts/pack.ps1

@@ -48,7 +48,7 @@ $targets = @{
 Delete-Existing "..\Version*"
 Delete-Existing "..\build\*"
 
-$version = Invoke-Expression "git describe --abbrev=0 --tags"
+$version = Get-VersionStr
 (New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null
 
 foreach ($t in $targets.GetEnumerator()) {

scripts/utils.ps1

@@ -62,6 +62,85 @@ function Digest-Hash($path) {
     return Invoke-Expression "md5sum $path"
 }
 
+function Get-VersionStr() {
+
+    # Clear existing variable
+    if ($string) { Clear-Variable -name string }
+
+    # Determine if git is available
+    if (Get-Command "git.exe" -ErrorAction SilentlyContinue)
+    {
+
+        # Determine if the current diesctory is a git repository
+        $GitPresent = Invoke-Expression "git rev-parse --is-inside-work-tree" -erroraction SilentlyContinue
+
+        if ( $GitPresent -eq 'true' )
+        {
+            $string = Invoke-Expression "git describe --abbrev=0 --tags"
+        }
+
+    }
+
+    # Fallback used when Git is not available
+    if ( -not($string) )
+    {
+        $string = Parse-Changelog ($PSScriptRoot + '\..\' + 'CHANGELOG.md')
+    }
+
+    # Add build number, if AppVeyor is present
+    if ( $Env:APPVEYOR -eq 'True' )
+    {
+        $string = $string + '.' + $Env:APPVEYOR_BUILD_NUMBER
+    }
+
+    # Remove starting 'v' characters
+    $string = $string -replace '^v+','' # normalize version string
+
+    return $string
+
+}
+
+function Parse-Changelog($file) {
+
+    # Define the regular expression to match the version string from changelog
+    [regex]$regex = '^## \[(?<version>[\w\-\.]+)\]\([^\n()]+\)\s+\([^\n()]+\)$';
+
+    # Find the first match of the version string which means the latest version
+    $version = Select-String -Path $file -Pattern $regex | Select-Object -First 1 | % { $_.Matches.Groups[1].Value }
+
+    return $version
+}
+
+function Create-RC($string, $path) {
+
+    $version  = $string + '.0.0.0.0' # padding for version string
+
+    if ( !(Test-Path "$path.sample") ) {
+        throw "Invalid path provided for resources file."
+    }
+
+    $resource = Get-Content -Path "$path.sample"
+    $pattern  = @( "Cmder-Major-Version", "Cmder-Minor-Version", "Cmder-Revision-Version", "Cmder-Build-Version" )
+    $index    = 0
+
+    # Replace all non-numeric characters to dots and split to array
+    $version = $version -replace '[^0-9]+','.' -split '\.'
+
+    foreach ($fragment in $version) {
+        if ( !$fragment ) { break }
+        elseif ($index -le $pattern.length) {
+            $resource = $resource.Replace( "{" + $pattern[$index++] + "}", $fragment )
+        }
+    }
+    
+    # Add the version string
+    $resource = $resource.Replace( "{Cmder-Version-Str}", '"' + $string + '"' )
+
+    # Write the results
+    Set-Content -Path $path -Value $resource
+
+}
+
 function Register-Cmder() {
     [CmdletBinding()]
     Param
@@ -121,6 +200,8 @@ function Download-File {
         $Url,
         $File
     )
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    
     # I think this is the problem
     $File = $File -Replace "/", "\"
     Write-Verbose "Downloading from $Url to $File"

vendor/cmder.sh

@@ -4,7 +4,7 @@
 # these customizations will follow Cmder if $CMDER_ROOT is copied
 # to another machine.
 #
-# Add system specific users customizations to $HOME/.bashrc, these 
+# Add system specific users customizations to $HOME/.bashrc, these
 # customizations will not follow Cmder to another machine.
 
 function runProfiled {
@@ -14,7 +14,7 @@ function runProfiled {
 
   if [ ! "x${profile_d_scripts}" = "x" ] ; then
     for x in ${profile_d_scripts} ; do
-      echo Sourcing "${1}/${x}"...
+      # echo Sourcing "${1}/${x}"...
       . "${1}/${x}"
     done
   fi
@@ -63,21 +63,21 @@ if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
   runProfiled  "${CMDER_USER_CONFIG}/profile.d"
 fi
 
+initialConfig="${CMDER_ROOT}/config/user-profile.sh"
 if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
     . "${CMDER_ROOT}/config/user-profile.sh"
 fi
 
-if [ -f "${CMDER_USER_CONFIG}/user-profile.sh" ] ; then
+if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+  initialConfig="${CMDER_USER_CONFIG}/user-profile.sh"
+  if [ -f "${CMDER_USER_CONFIG}/user-profile.sh" ] ; then
     . "${CMDER_USER_CONFIG}/user-profile.sh"
-else
+  fi
-    if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+fi
-      initialProfile="${CMDER_USER_CONFIG}/user-profile.sh"
-    else
-      initialProfile="${CMDER_ROOT}/config/user-profile.sh"
-    fi
 
-    echo Creating user startup file: "${initialProfile}"
+if [ ! -f "${initialConfig}" ] ; then
-    cat <<-eof >"${initialProfile}"
+    echo Creating user startup file: "${initialConfig}"
+    cat <<-eof >"${initialConfig}"
 # use this file to run your own startup commands for msys2 bash'
 
 # To add a new vendor to the path, do something like:

vendor/init.bat

@@ -27,22 +27,28 @@ if not defined CMDER_ROOT (
 :: Remove trailing '\' from %CMDER_ROOT%
 if "%CMDER_ROOT:~-1%" == "\" SET "CMDER_ROOT=%CMDER_ROOT:~0,-1%"
 
+call "%cmder_root%\vendor\lib\lib_base"
+call "%cmder_root%\vendor\lib\lib_path"
+call "%cmder_root%\vendor\lib\lib_console"
+call "%cmder_root%\vendor\lib\lib_git"
+call "%cmder_root%\vendor\lib\lib_profile"
+
 :var_loop
     if "%~1" == "" (
         goto :start
-    ) else if "%1"=="/v" (
+    ) else if /i "%1"=="/v" (
         set verbose-output=1
-    ) else if "%1"=="/d" (
+    ) else if /i "%1"=="/d" (
         set debug-output=1
-    ) else if "%1" == "/max_depth" (
+    ) else if /i "%1" == "/max_depth" (
         if "%~2" geq "1" if "%~2" leq "5" (
             set "max_depth=%~2"
             shift
         ) else (
-            call :show_error '/max_depth' requires a number between 1 and 5!
+            %lib_console% show_error "'/max_depth' requires a number between 1 and 5!"
             exit /b
         )
-    ) else if "%1" == "/c" (
+    ) else if /i "%1" == "/c" (
         if exist "%~2" (
             if not exist "%~2\bin" mkdir "%~2\bin"
             set "cmder_user_bin=%~2\bin"
@@ -50,28 +56,28 @@ if "%CMDER_ROOT:~-1%" == "\" SET "CMDER_ROOT=%CMDER_ROOT:~0,-1%"
             set "cmder_user_config=%~2\config"
             shift
         )
-    ) else if "%1" == "/user_aliases" (
+    ) else if /i "%1" == "/user_aliases" (
         if exist "%~2" (
             set "user-aliases=%~2"
             shift
         )
-    ) else if "%1" == "/git_install_root" (
+    ) else if /i "%1" == "/git_install_root" (
         if exist "%~2" (
             set "GIT_INSTALL_ROOT=%~2"
             shift
         ) else (
-            call :show_error The Git install root folder "%2", you specified does not exist!
+            %lib_console% show_error "The Git install root folder "%~2", you specified does not exist!"
             exit /b
         )
-    ) else if "%1" == "/home" (
+    ) else if /i "%1" == "/home" (
         if exist "%~2" (
             set "HOME=%~2"
             shift
         ) else (
-            call :show_error The home folder "%2", you specified does not exist!
+            %lib_console% show_error The home folder "%2", you specified does not exist!
             exit /b
         )
-    ) else if "%1" == "/svn_ssh" (
+    ) else if /i "%1" == "/svn_ssh" (
         set SVN_SSH=%2
         shift
     )
@@ -79,12 +85,11 @@ if "%CMDER_ROOT:~-1%" == "\" SET "CMDER_ROOT=%CMDER_ROOT:~0,-1%"
 goto var_loop
 
 :start
-
+%lib_console% debug-output init.bat "Env Var - CMDER_ROOT=%CMDER_ROOT%"
-call :debug-output init.bat - Env Var - CMDER_ROOT=%CMDER_ROOT%
+%lib_console% debug-output init.bat "Env Var - debug-output=%debug-output%"
-call :debug-output init.bat - Env Var - debug-output=%debug-output%
 
 if defined CMDER_USER_CONFIG (
-    call :debug-output init.bat - CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!
+    %lib_console% debug-output init.bat "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!"
 )
 
 :: Pick right version of clink
@@ -124,13 +129,16 @@ 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 :FOUND_GIT)
+    if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" goto :FOUND_GIT)
 )
 
+%lib_console% debug-output init.bat "Looking for Git install root..."
+
 :: get the version information for vendored git binary
-setlocal enabledelayedexpansion
+%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
-call :read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
+%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 (
@@ -140,11 +148,12 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do (
     popd
 
     :: get the version information for the user provided git binary
-    call :read_version USER "!test_dir!"
+    %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
-        call :compare_versions USER VENDORED
+        %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" (
@@ -175,7 +184,7 @@ 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"
-    call :enhance_path "!GIT_INSTALL_ROOT!\cmd" 
+    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd"
 ) else (
     goto :NO_GIT
 )
@@ -184,33 +193,39 @@ if exist "%CMDER_ROOT%\vendor\git-for-windows" (
 :: Add git to the path
 if defined GIT_INSTALL_ROOT (
     rem add the unix commands at the end to not shadow windows commands like more
-    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" call :enhance_path "!GIT_INSTALL_ROOT!\cmd" append
+    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" append
     if exist "!GIT_INSTALL_ROOT!\mingw32" (
-        call :enhance_path "!GIT_INSTALL_ROOT!\mingw32" append
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32" append
     ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
-        call :enhance_path "!GIT_INSTALL_ROOT!\mingw64" append
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64" append
     )
-    if exist "!GIT_INSTALL_ROOT!\usr\bin" call :enhance_path "%GIT_INSTALL_ROOT%\usr\bin" append
+    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append
+
     :: define SVN_SSH so we can use git svn with ssh svn repositories
     if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
 )
 
-:NO_GIT
 endlocal & set "PATH=%PATH%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
-call :debug-output init.bat - Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%
+%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%'"
+goto :PATH_ENHANCE
 
-:: Enhance Path
+:NO_GIT
-call :enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
+:: Skip this if GIT WAS FOUND else we did 'endlocal' above!
+endlocal
+
+:PATH_ENHANCE
+%lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
 if defined CMDER_USER_BIN (
-  call :enhance_path "%CMDER_USER_BIN%" %max_depth%
+  %lib_path% enhance_path_recursive "%CMDER_USER_BIN%" %max_depth%
 )
-call :enhance_path "%CMDER_ROOT%" append
+%lib_path% enhance_path "%CMDER_ROOT%" append
 
 :: Drop *.bat and *.cmd files into "%CMDER_ROOT%\config\profile.d"
 :: to run them at startup.
-call :run_profile_d "%CMDER_ROOT%\config\profile.d"
+%lib_profile% run_profile_d "%CMDER_ROOT%\config\profile.d"
 if defined CMDER_USER_CONFIG (
-  call :run_profile_d "%CMDER_USER_CONFIG%\profile.d"
+  %lib_profile% run_profile_d "%CMDER_USER_CONFIG%\profile.d"
 )
 
 :: Allows user to override default aliases store using profile.d
@@ -269,7 +284,7 @@ call "%user-aliases%"
 :: Basically we need to execute this post-install.bat because we are
 :: manually extracting the archive rather than executing the 7z sfx
 if exist "%GIT_INSTALL_ROOT%\post-install.bat" (
-    call :verbose-output Running Git for Windows one time Post Install....
+    %lib_console% verbose-output "Running Git for Windows one time Post Install...."
     pushd "%GIT_INSTALL_ROOT%\"
     "%GIT_INSTALL_ROOT%\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat
     popd
@@ -277,18 +292,24 @@ if exist "%GIT_INSTALL_ROOT%\post-install.bat" (
 
 :: Set home path
 if not defined HOME set "HOME=%USERPROFILE%"
-call :debug-output init.bat - Env Var - HOME=%HOME%
+%lib_console% debug-output 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
     call "%CMDER_ROOT%\config\user-profile.cmd"
 )
 
-if defined CMDER_USER_CONFIG if exist "%CMDER_USER_CONFIG%\user-profile.cmd" (
+if defined CMDER_USER_CONFIG (
-    REM Create this file and place your own command in there
+  set "initialConfig=%CMDER_USER_CONFIG%\user-profile.cmd"
-    call "%CMDER_USER_CONFIG%\user-profile.cmd"
+  if exist "%CMDER_USER_CONFIG%\user-profile.cmd" (
-) else (
+      REM Create this file and place your own command in there
-    echo Creating user startup file: "%CMDER_ROOT%\config\user-profile.cmd"
+      call "%CMDER_USER_CONFIG%\user-profile.cmd"
+  )
+)
+
+if not exist "%initialConfig%" (
+    echo Creating user startup file: "%initialConfig%"
     (
 echo :: use this file to run your own startup commands
 echo :: use  in front of the command to prevent printing the command
@@ -304,243 +325,8 @@ echo :: you can add your plugins to the cmder path like so
 echo :: set "PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%"
 echo.
 echo @echo off
-) >"%temp%\user-profile.tmp"
+) >"%initialConfig%"
-
-  if defined CMDER_USER_CONFIG (
-    copy "%temp%\user-profile.tmp" "%CMDER_USER_CONFIG%\user-profile.cmd"
-  ) else (
-    copy "%temp%\user-profile.tmp" "%CMDER_ROOT%\config\user-profile.cmd"
-  )
 )
 
+set initialConfig=
 exit /b
-
-::
-:: sub-routines below here
-::
-:debug-output
-    if %debug-output% gtr 0 echo %* & echo.
-    exit /b
-
-:verbose-output
-    if %debug-output% gtr 0 (
-      call :debug-output :verbose-output - %*
-    ) else if %verbose-output% gtr 0 (
-      echo %*
-    )
-    exit /b
-
-:show_error
-    echo ERROR: %*
-    echo CMDER Shell Initialization has Failed!
-    exit /b
-
-:run_profile_d
-  if not exist "%~1" (
-    mkdir "%~1"
-  )
-  
-  pushd "%~1"
-  for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
-    call :verbose-output Calling "%~1\%%x"...
-    call "%~1\%%x"
-  )
-  popd
-  exit /b
-
-::
-:: specific to git version comparing
-::
-:read_version
-    :: clear the variables
-    set GIT_VERSION_%~1=
-
-    :: set the executable path
-    set "git_executable=%~2\git.exe"
-    call :debug-output :read_version - Env Var - git_executable=%git_executable%
-
-    :: check if the executable actually exists
-    if not exist "%git_executable%" (
-        call :verbose-output "%git_executable%" does not exist!
-        exit /b -255
-    )
-
-    :: get the git version in the provided directory
-    for /F "tokens=1,2,3 usebackq" %%F in (`"%git_executable%" --version 2^>nul`) do (
-        if "%%F %%G" == "git version" (
-            set "GIT_VERSION_%~1=%%H"
-            call :debug-output :read_version - Env Var - GIT_VERSION_%~1=%%H
-        ) else (
-            echo "git --version" returned an inproper version string!
-            pause
-            exit /b
-        )
-    )
-
-    :: parse the returned string
-    call :debug-output :read_version - Calling - :validate_version "%~1" !GIT_VERSION_%~1!
-    call :validate_version "%~1" !GIT_VERSION_%~1!
-    exit /b
-
-:parse_version
-    :: process a `x.x.x.xxxx.x` formatted string
-    for /F "tokens=1-3* delims=.,-" %%A in ("%2") do (
-        set "%~1_MAJOR=%%A"
-        set "%~1_MINOR=%%B"
-        set "%~1_PATCH=%%C"
-        set "%~1_BUILD=%%D"
-    )
-    exit /b
-
-:validate_version
-    :: now parse the version information into the corresponding variables
-    call :parse_version %~1 %~2
-
-    :: ... and maybe display it, for debugging purposes.
-    call :debug-output :validate_version - Found Git Version for %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
-    exit /b
-
-:compare_versions
-    :: checks all major, minor, patch and build variables for the given arguments.
-    :: whichever binary that has the most recent version will be used based on the return code.
-
-    :: call :debug-output Comparing:
-    :: call :debug-output %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
-    :: call :debug-output %~2: !%~2_MAJOR!.!%~2_MINOR!.!%~2_PATCH!.!%~2_BUILD!
-
-    if !%~1_MAJOR! GTR !%~2_MAJOR! (exit /b  1)
-    if !%~1_MAJOR! LSS !%~2_MAJOR! (exit /b -1)
-
-    if !%~1_MINOR! GTR !%~2_MINOR! (exit /b  1)
-    if !%~1_MINOR! LSS !%~2_MINOR! (exit /b -1)
-
-    if !%~1_PATCH! GTR !%~2_PATCH! (exit /b  1)
-    if !%~1_PATCH! LSS !%~2_PATCH! (exit /b -1)
-
-    if !%~1_BUILD! GTR !%~2_BUILD! (exit /b  1)
-    if !%~1_BUILD! LSS !%~2_BUILD! (exit /b -1)
-
-    :: looks like we have the same versions.
-    exit /b 0
-
-:enhance_path
-    setlocal enabledelayedexpansion
-    if "%~1" neq "" (
-        if exist "%~1" (
-            set "add_path=%~1"
-        ) else (
-            call :show_error :enhance_path - The path specified. "%~1", does not exist!
-            exit 1
-        )
-    ) else (
-        call :show_error You must specify a directory to add to the path!
-        exit 1
-    )
-    
-    if "%~2" neq "" if /i "%~2" == "append" (
-        set "position=%~2"
-    ) else (
-        set "position="
-    )
-
-    set "find_query=%add_path%"
-    set "find_query=%find_query:\=\\%"
-    set "find_query=%find_query: =\ %"
-    set found=0
-
-    call :debug-output  :enhance_path "Env Var - find_query=%find_query%"
-    echo "%PATH%"|findstr >nul /I /R ";%find_query%\"$"
-    if "!ERRORLEVEL!" == "0" set found=1
-
-    call :debug-output  :enhance_path "Env Var 1 - found=!found!"
-    if "!found!" == "0" (
-        echo "%PATH%"|findstr >nul /i /r ";%find_query%;"
-        if "!ERRORLEVEL!" == "0" set found=1
-        call :debug-output  :enhance_path "Env Var 2 - found=!found!"
-    )
-
-    if "%found%" == "0" (
-        call :debug-output :enhance_path "BEFORE Env Var - PATH=!path!"
-        if /i "%position%" == "append" (
-            call :debug-output :enhance_path "Appending '%add_path%'"
-            set "PATH=%PATH%;%add_path%"
-        ) else (
-            call :debug-output :enhance_path "Prepending '%add_path%'"
-            set "PATH=%add_path%;%PATH%"
-        )
-
-        call :debug-output  :enhance_path "AFTER Env Var - PATH=!path!"
-    )
-
-    endlocal & set "PATH=%PATH%"
-    exit /b
-
-:enhance_path_recursive
-::: ==============================================================================
-:::enhance_path_recursive - Add a directory and subs to the path env variable if
-:::                         required.
-::: 
-:::include: 
-::: 
-:::  call "$0"
-:::
-:::usage: 
-::: 
-:::  call "%~DP0lib_path" enhance_path_recursive "[dir_path]" [max_depth] [append]
-::: 
-:::required: 
-::: 
-:::  [dir_path] <in> Fully qualified directory path. Ex: "c:\bin"
-::: 
-:::dptions: 
-::: 
-:::  [max_depth] <in> Max recuse depth.  Default: 1
-:::
-:::  append      <in> Append instead rather than pre-pend "[dir_path]"
-::: 
-:::output:
-::: 
-:::  path       <out> Sets the path env variable if required. 
-::: ------------------------------------------------------------------------------
-
-    setlocal enabledelayedexpansion
-    if "%~1" neq "" (
-        set "add_path=%~1"
-    ) else (
-        call :directory to add to the path!"
-        exit 1
-    )
-    
-    if "%~2" gtr "1" (
-        set "max_depth=%~2"
-    ) else (
-        set "max_depth=1"
-    )
-
-    if "%~3" neq "" if /i "%~3" == "append" (
-        set "position=%~3"
-    ) else (
-        set "position="
-    )
-
-    if "%depth%" == "" set depth=0
-
-    call :debug-output  :enhance_path_recursive "Env Var - add_path=%add_path%"
-    call :debug-output  :enhance_path_recursive "Env Var - position=%position%"
-    call :debug-output  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
-
-    if %max_depth% gtr !depth! (
-        call :debug-output :enhance_path_recursive "Adding parent directory - '%add_path%'"
-        call :enhance_path "%add_path%" %position%
-        set /a "depth=!depth!+1"
-
-        for /d %%i in ("%add_path%\*") do (
-            call :debug-output  :enhance_path_recursive "Env Var BEFORE - depth=!depth!"
-            call :debug-output :enhance_path_recursive "Found Subdirectory - '%%~fi'"
-            call :enhance_path_recursive "%%~fi" %max_depth% %position%
-            call :debug-output  :enhance_path_recursive "Env Var AFTER- depth=!depth!"
-        )
-    )
-
-    endlocal & set "PATH=%PATH%"
-    exit /b

vendor/lib/lib_base.cmd

@@ -0,0 +1,48 @@
+@echo off
+
+set lib_base=call "%~dp0lib_base.cmd"
+
+if "%~1" == "/h" (
+    %lib_base% help "%0"
+) else if "%1" neq "" (
+    call :%*
+)
+
+exit /b
+
+:help
+:::===============================================================================
+:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
+:::.
+:::include:
+:::.
+:::       call "$0"
+:::.
+:::usage:
+:::.
+:::       %lib_base% show_subs "file"
+:::.
+:::options:
+:::.
+:::       file <in> full path to file containing lib_routines to display
+:::.
+:::-------------------------------------------------------------------------------
+
+    for /f "tokens=* delims=:" %%a in ('type "%~1" ^| findstr /i /r "^:::"') do (
+        rem echo a="%%a"
+
+        if "%%a"==" " (
+            echo.
+        if "%%a"=="." (
+            echo.
+        ) else if /i "%%a" == "usage" (
+            echo %%a:
+        ) else if /i "%%a" == "options" (
+            echo %%a:
+        ) else if not "%%a" == "" (
+            echo %%a
+        )
+    )
+
+    pause
+    exit /b

vendor/lib/lib_console.cmd

@@ -0,0 +1,79 @@
+@echo off
+
+rem set args=%*
+
+call "%~dp0lib_base.cmd"
+set lib_console=call "%~dp0lib_console.cmd"
+
+if "%~1" == "/h" (
+    %lib_base% help "%0"
+) else if "%1" neq "" (
+    call :%*
+)
+
+exit /b
+
+:debug-output
+:::===============================================================================
+:::debug-output - Output a debug message to the console.
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_console% debug-output [caller] [message]
+:::.
+:::required:
+:::.
+:::  [caller]  <in> Script/sub routine name calling debug-output
+:::.
+:::  [message] <in> Message text to display.
+:::.
+:::-------------------------------------------------------------------------------
+
+    if %debug-output% gtr 0 echo DEBUG(%~1): %~2 & echo.
+    exit /b
+
+:verbose-output
+:::===============================================================================
+:::verbose-output - Output a debug message to the console.
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_console% verbose-output "[message]"
+:::.
+:::required:
+:::.
+:::  [message] <in> Message text to display.
+:::.
+:::-------------------------------------------------------------------------------
+
+    if %verbose-output% gtr 0 echo %~1
+    exit /b
+
+:show_error
+:::===============================================================================
+:::show_error - Output an error message to the console.
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_console% show_error "[message]"
+:::.
+:::required:
+:::.
+:::  [message] <in> Message text to display.
+:::.
+:::-------------------------------------------------------------------------------
+
+    echo ERROR: %~1
+    exit /b

vendor/lib/lib_git.cmd

@@ -0,0 +1,168 @@
+@echo off
+
+
+call "%~dp0lib_base.cmd"
+call "%%~dp0lib_console.cmd"
+set lib_git=call "%~dp0lib_git.cmd"
+
+
+if "%~1" == "/h" (
+    %lib_base% help "%0"
+) else if "%1" neq "" (
+    call :%*
+)
+
+exit /b
+
+:read_version
+:::===============================================================================
+:::read_version - Get the git.exe verion
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% read_version "[dir_path]"
+:::.
+:::required:
+:::.
+:::  [GIT SCOPE]   <in> USER | VENDORED
+:::  [GIT PATH]    <in> Fully qualified path to the Git command root.
+:::.
+:::output:
+:::.
+:::  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%"
+
+    :: check if the executable actually exists
+    if not exist "%git_executable%" (
+        %lib_console% debug-output :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 (
+        if /i "%%A %%B" == "git version" (
+            set "GIT_VERSION_%~1=%%C"
+            %lib_console% debug-output :read_version "Env Var - GIT_VERSION_%~1=%%C"
+        ) else (
+            %lib_console% show_error "git --version" returned an inproper version string!
+            pause
+            exit /b
+        )
+    )
+
+    endlocal & set GIT_VERSION%~1=!GIT_VERSION%~1!
+    exit /b
+
+:parse_version
+:::===============================================================================
+:::parse_version - Parse semantic version string 'x.x.x.x' and return the pieces
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% parse_version "[VERSION]"
+:::.
+:::required:
+:::.
+:::  [SCOPE]     <in> USER | VENDORED
+:::  [VERSION]   <in> Semantic version String. Ex: 1.2.3.4
+:::.
+:::output:
+:::.
+:::  [SCOPE]_MAJOR <out> Scoped Major version.
+:::  [SCOPE]_MINOR <out> Scoped Minor version.
+:::  [SCOPE]_PATCH <out> Scoped Patch version.
+:::  [SCOPE]_BUILD <out> Scoped Build version.
+:::-------------------------------------------------------------------------------
+
+    setlocal enabledelayedexpansion
+    :: process a `x.x.x.xxxx.x` formatted string
+    for /F "tokens=1-3* delims=.,-" %%A in ("%2") do (
+        set "%~1_MAJOR=%%A"
+        set "%~1_MINOR=%%B"
+        set "%~1_PATCH=%%C"
+        set "%~1_BUILD=%%D"
+    )
+
+    endlocal & set "%~1_MAJOR=!%~1_MAJOR!" & set "%~1_MINOR=!%~1_MINOR!" & set "%~1_PATCH=!%~1_PATCH!" & set "%~1_BUILD=!%~1_BUILD!"
+    exit /b
+
+:validate_version
+:::===============================================================================
+:::validate_version - Validate semantic version string 'x.x.x.x'.
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% validate_version [SCOPE] [VERSION]
+:::.
+:::required:
+:::.
+:::  [SCOPE]     <in> Example:  USER | VENDORED
+:::  [VERSION]   <in> Semantic version String. Ex: 1.2.3.4
+:::-------------------------------------------------------------------------------
+
+    :: now parse the version information into the corresponding variables
+    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!"
+    exit /b
+
+:compare_versions
+:::===============================================================================
+:::compare_version - Compare semantic versions return latest version.
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  %lib_git% validate_version [SCOPE1] [SCOPE2]
+:::.
+:::required:
+:::.
+:::  [SCOPE1]    <in> Example: USER
+:::  [SCOPE2]    <in> Example: VENDOR
+:::-------------------------------------------------------------------------------
+
+    :: 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!
+
+    if !%~1_MAJOR! GTR !%~2_MAJOR! (exit /b  1)
+    if !%~1_MAJOR! LSS !%~2_MAJOR! (exit /b -1)
+
+    if !%~1_MINOR! GTR !%~2_MINOR! (exit /b  1)
+    if !%~1_MINOR! LSS !%~2_MINOR! (exit /b -1)
+
+    if !%~1_PATCH! GTR !%~2_PATCH! (exit /b  1)
+    if !%~1_PATCH! LSS !%~2_PATCH! (exit /b -1)
+
+    if !%~1_BUILD! GTR !%~2_BUILD! (exit /b  1)
+    if !%~1_BUILD! LSS !%~2_BUILD! (exit /b -1)
+
+    :: looks like we have the same versions.
+    exit /b 0

vendor/lib/lib_path.cmd

@@ -0,0 +1,155 @@
+@echo off
+
+
+call "%~dp0lib_base.cmd"
+call "%%~dp0lib_console"
+set lib_path=call "%~dp0lib_path.cmd"
+
+if "%~1" == "/h" (
+    %lib_base% help "%0"
+) else if "%1" neq "" (
+    call :%*
+)
+
+exit /b
+
+:enhance_path
+:::===============================================================================
+:::enhance_path - Add a directory to the path env variable if required.
+:::
+:::include:
+:::
+:::  call "$0"
+:::
+:::usage:
+:::
+:::  %lib_path% enhance_path "[dir_path]" [append]
+:::
+:::required:
+:::
+:::  [dir_path] <in> Fully qualified directory path. Ex: "c:\bin"
+:::
+:::options:
+:::
+:::  append     <in> Append to the path env variable rather than pre-pend.
+:::
+:::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!"
+        exit 1
+    )
+
+    if "%~2" neq "" if /i "%~2" == "append" (
+        set "position=%~2"
+    ) else (
+        set "position="
+    )
+
+    set "find_query=%add_path%"
+    set "find_query=%find_query:\=\\%"
+    set "find_query=%find_query: =\ %"
+    set found=0
+
+    %lib_console% debug-output  :enhance_path "Env Var - find_query=%find_query%"
+    echo "%PATH%"|findstr >nul /I /R ";%find_query%\"$"
+    if "!ERRORLEVEL!" == "0" set found=1
+
+    %lib_console% debug-output  :enhance_path "Env Var 1 - found=!found!"
+    if "!found!" == "0" (
+        echo "%PATH%"|findstr >nul /i /r ";%find_query%;"
+        if "!ERRORLEVEL!" == "0" set found=1
+        %lib_console% debug-output  :enhance_path "Env Var 2 - 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%"
+        ) else (
+            %lib_console% debug-output :enhance_path "Prepending '%add_path%'"
+            set "PATH=%add_path%;%PATH%"
+        )
+
+        %lib_console% debug-output  :enhance_path "AFTER Env Var - PATH=!path!"
+    )
+
+    endlocal & set "PATH=%PATH:;;=;%"
+    exit /b
+
+:enhance_path_recursive
+:::===============================================================================
+:::enhance_path_recursive - Add a directory and subs to the path env variable if
+:::                         required.
+:::.
+:::include:
+:::.
+:::  call "$0"
+:::.
+:::usage:
+:::.
+:::  call "%~DP0lib_path" enhance_path_recursive "[dir_path]" [max_depth] [append]
+:::.
+:::required:
+:::.
+:::  [dir_path] <in> Fully qualified directory path. Ex: "c:\bin"
+:::.
+:::options:
+:::.
+:::  [max_depth] <in> Max recuse depth.  Default: 1
+:::.
+:::  append      <in> Append instead to path env variable rather than pre-pend.
+:::.
+:::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!"
+        exit 1
+    )
+
+    if "%~2" gtr "1" (
+        set "max_depth=%~2"
+    ) else (
+        set "max_depth=1"
+    )
+
+    if "%~3" neq "" if /i "%~3" == "append" (
+        set "position=%~3"
+    ) else (
+        set "position="
+    )
+
+    if "%depth%" == "" set depth=0
+
+    %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!"
+        )
+    )
+
+    endlocal & set "PATH=%PATH%"
+    exit /b

vendor/lib/lib_profile.cmd

@@ -0,0 +1,46 @@
+@echo off
+
+
+call "%~dp0lib_base.cmd"
+call "%%~dp0lib_console"
+set lib_profile=call "%~dp0lib_profile.cmd"
+
+if "%~1" == "/h" (
+    %lib_base% help "%0"
+) else if "%1" neq "" (
+    call :%*
+)
+
+exit /b
+
+:run_profile_d
+:::===============================================================================
+:::run_profile_d - Run all scripts in the passed dir path
+:::
+:::include:
+:::
+:::  call "$0"
+:::
+:::usage:
+:::
+:::  %lib_profile% "[dir_path]"
+:::
+:::required:
+:::
+:::  [dir_path] <in> Fully qualified directory path containing init *.cmd|*.bat.
+:::                  Example: "c:\bin"
+:::
+:::  path       <out> Sets the path env variable if required.
+:::-------------------------------------------------------------------------------
+
+  if not exist "%~1" (
+    mkdir "%~1"
+  )
+
+  pushd "%~1"
+  for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
+    %lib_console% verbose-output "Calling '%~1\%%x'..."
+    call "%~1\%%x"
+  )
+  popd
+  exit /b

vendor/profile.ps1

@@ -140,7 +140,7 @@ popd
 
 # Drop *.ps1 files into "$ENV:CMDER_USER_CONFIG\config\profile.d"
 # to source them at startup.  Requires using cmder.exe /C [cmder_user_root_path] argument
-if ($ENV:CMDER_USER_CONFIG -ne "" -and -not (test-path "$ENV:CMDER_USER_CONFIG\profile.d")) {
+if ($ENV:CMDER_USER_CONFIG -ne "" -and (test-path "$ENV:CMDER_USER_CONFIG\profile.d")) {
     pushd $ENV:CMDER_USER_CONFIG\profile.d
     foreach ($x in Get-ChildItem *.ps1) {
       # write-host write-host Sourcing $x

vendor/psmodules/PsGet/PsGet.psm1

@@ -9,8 +9,16 @@
 #region Setup
 
 Write-Debug 'Set up the global scope config variables.'
-$global:UserModuleBasePath = Join-Path -Path ([Environment]::GetFolderPath('MyDocuments')) -ChildPath 'WindowsPowerShell\Modules'
+if ([Environment]::GetFolderPath('MyDocuments')) {
-$global:CommonGlobalModuleBasePath = Join-Path -Path $env:CommonProgramFiles -ChildPath 'Modules'
+    $global:UserModuleBasePath = Join-Path -Path ([Environment]::GetFolderPath('MyDocuments')) -ChildPath 'WindowsPowerShell\Modules'
+}
+else {
+    # Support scenarios where PSGet is running without a MyDocuments special folder (e.g. executing within a DSC resource)
+    $global:UserModuleBasePath = Join-Path -Path $env:ProgramFiles -ChildPath 'WindowsPowerShell\Modules'
+}
+
+# NOTE: Path changed to align with current MS conventions
+$global:CommonGlobalModuleBasePath = Join-Path -Path $env:ProgramFiles -ChildPath 'WindowsPowerShell\Modules'
 
 if (-not (Test-Path -Path:variable:global:PsGetDirectoryUrl)) {
     $global:PsGetDirectoryUrl = 'https://github.com/psget/psget/raw/master/Directory.xml'
@@ -96,16 +104,16 @@ Set-Variable -Name PSGET_PSD1 -Value 'PSD1' -Option Constant -Scope Script
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
         Default: definition in directory file or 'Install.ps1'
 
     .PARAMETER Force
-        OBSOLATE
+        OBSOLETE
         Alternative name for 'Update'.
 
     .PARAMETER Startup
-        OBSOLATE
+        OBSOLETE
         Alternative name for 'AddToProfile'.
 
     .LINK
@@ -349,7 +357,7 @@ function Install-Module {
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
         Will not be check in combination with -All switch.
         Default: 'Install.ps1'
@@ -414,7 +422,7 @@ function Update-Module {
 
         }
         else {
-            Install-Module -Module:$Module -Destination:$Destination -ModuleHash:$ModuleHash -Global:$Global -DoNotImport:$DoNotImport -AddToProfile:$AddToProfile -DirectoryUrl:$DirectoryUrl -Updat -DoNotPostInstall:$DoNotPostInstall -PostInstallHook:$PostInstallHook
+            Install-Module -Module:$Module -Destination:$Destination -ModuleHash:$ModuleHash -Global:$Global -DoNotImport:$DoNotImport -AddToProfile:$AddToProfile -DirectoryUrl:$DirectoryUrl -Update -DoNotPostInstall:$DoNotPostInstall -PostInstallHook:$PostInstallHook
         }
     }
 }
@@ -480,7 +488,9 @@ function Get-PsGetModuleInfo {
 
         try {
             Write-Verbose "Downloading modules repository from $DirectoryUrl"
-            $repoRaw = $client.DownloadString($DirectoryUrl)
+            $stream = $client.OpenRead($DirectoryUrl)
+            $repoXmlTemp = New-Object -TypeName System.Xml.XmlDocument
+            $repoXmlTemp.Load($stream)
             $StatusCode = 200
         }
         catch [System.Net.WebException] {
@@ -489,7 +499,7 @@ function Get-PsGetModuleInfo {
         }
 
         if ($StatusCode -eq 200) {
-            $repoXml = [xml]$repoRaw
+            $repoXml = [xml]$repoXmlTemp
 
             $CacheEntry.ETag = $client.ResponseHeaders['ETag']
             if (-not (Test-Path -Path $PsGetDataPath)) {
@@ -629,7 +639,7 @@ function Get-PsGetModuleHash {
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
         Default: definition in directory file or 'Install.ps1'
 #>
@@ -754,7 +764,7 @@ function Install-ModuleFromDirectory {
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
         Default: 'Install.ps1'
 #>
@@ -863,7 +873,7 @@ function Install-ModuleFromWeb {
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
         Default: 'Install.ps1'
 #>
@@ -1010,7 +1020,7 @@ function Install-ModuleFromLocal {
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
         Default: 'Install.ps1'
 #>
@@ -1311,6 +1321,13 @@ function Import-ModuleGlobally {
         Write-Verbose "Importing installed module '$ModuleName' from '$($installedModule.ModuleBase)'"
         Import-Module -Name $ModuleBase -Global -Force:$Force
 
+        # For psget no further checks are needed and their execution cause
+        # an error for the update process of 'psget'
+        # https://github.com/psget/psget/issues/186
+        if ($ModuleName -eq 'PsGet') {
+            return
+        }
+
         $IdentityExtension = [System.IO.Path]::GetExtension((Get-ModuleFile -Path $ModuleBase -ModuleName $ModuleName))
         if ($IdentityExtension -eq '.dll') {
             # import module twice for binary modules to workaround PowerShell bug:
@@ -1514,7 +1531,7 @@ function Invoke-DownloadModuleFromWeb {
     .PARAMETER DoNotPostInstall
         If defined, the PostInstallHook is not executed.
 
-    .PARAMERTER PostInstallHook
+    .PARAMETER PostInstallHook
         Defines the name of a script inside the installed module folder which should be executed after installation.
 #>
 function Install-ModuleToDestination {
@@ -1628,7 +1645,7 @@ function Install-ModuleToDestination {
 
         $isDestinationInPSModulePath = $env:PSModulePath.Contains($Destination)
         if ($isDestinationInPSModulePath) {
-            if (-not (Get-Module $ModuleName -ListAvailable)) {
+            if (-not (Get-Module $InstallWithModuleName -ListAvailable)) {
                 throw 'For some unexpected reasons module was not installed.'
             }
         }
@@ -1639,14 +1656,14 @@ function Install-ModuleToDestination {
         }
 
         if ($Update) {
-            Write-Host "Module $ModuleName was successfully updated." -Foreground Green
+            Write-Host "Module $InstallWithModuleName was successfully updated." -Foreground Green
         }
         else {
-            Write-Host "Module $ModuleName was successfully installed." -Foreground Green
+            Write-Host "Module $InstallWithModuleName was successfully installed." -Foreground Green
         }
 
         if (-not $DoNotImport) {
-            Import-ModuleGlobally -ModuleName:$ModuleName -ModuleBase:$targetFolderPath -Force:$Update
+            Import-ModuleGlobally -ModuleName:$InstallWithModuleName -ModuleBase:$targetFolderPath -Force:$Update
         }
 
         if ($isDestinationInPSModulePath -and $AddToProfile) {
@@ -1657,8 +1674,8 @@ function Install-ModuleToDestination {
                     New-Item $PROFILE -Type File -Force -ErrorAction Stop
                 }
 
-                if (Select-String $PROFILE -Pattern "Import-Module $ModuleName") {
+                if (Select-String $PROFILE -Pattern "Import-Module $InstallWithModuleName") {
-                    Write-Verbose "Import-Module $ModuleName command already in your profile"
+                    Write-Verbose "Import-Module $InstallWithModuleName command already in your profile"
                 }
                 else {
                     $signature = Get-AuthenticodeSignature -FilePath $PROFILE
@@ -1667,8 +1684,8 @@ function Install-ModuleToDestination {
                         Write-Error "PsGet cannot modify code-signed profile '$PROFILE'."
                     }
                     else {
-                        Write-Verbose "Add Import-Module $ModuleName command to the profile"
+                        Write-Verbose "Add Import-Module $InstallWithModuleName command to the profile"
-                        "`nImport-Module $ModuleName" | Add-Content $PROFILE
+                        "`nImport-Module $InstallWithModuleName" | Add-Content $PROFILE
                     }
                 }
             }
@@ -1736,7 +1753,7 @@ function Test-ModuleInstalledAndImport {
                     return $false
                 }
 
-                Write-Warning "The module '$ModuleName' was installed at more then one location. Installed paths:`n`t$($installedModule.ModuleBase | Format-List | Out-String)`n'$($firstInstalledModule.ModuleBase)' is the searched destination."
+                Write-Warning "The module '$ModuleName' was installed at more than one location. Installed paths:`n`t$($installedModule.ModuleBase | Format-List | Out-String)`n'$($firstInstalledModule.ModuleBase)' is the searched destination."
                 $installedModule = $targetModule
             }
             elseif ((Split-Path $installedModule.ModuleBase) -ne $Destination) {
@@ -1801,7 +1818,7 @@ function Expand-ZipModule {
 
         # Check if powershell v3+ and .net v4.5 is available
         $netFailed = $true
-        if ( $PSVersionTable.PSVersion.Major -ge 3 -and (Get-ChildItem -Path 'HKLM:\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4' -Recurse | Get-ItemProperty -Name Version | Where-Object { $_.Version -like '4.5*' }) ) {
+        if ( $PSVersionTable.PSVersion.Major -ge 3 -and (Get-ChildItem -Path 'HKLM:\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4' -Recurse | Get-ItemProperty -Name Version | Where-Object { $_.Version -like '4.5*' -Or $_.Version -ge '4.5' }) ) {
             Write-Debug 'Attempting unzip using the .NET Framework...'
 
             try {
@@ -1910,14 +1927,20 @@ function Invoke-DownloadNuGetPackage {
         }
 
         Write-Verbose "Querying '$Source' repository for package with Id '$NuGetPackageId'"
-        $Url = "{1}Packages()?`$filter=tolower(Id)+eq+'{0}'&`$orderby=Id" -f $NuGetPackageId.ToLower(), $Source
-        Write-Debug "NuGet query url: $Url"
-
         try {
+            $Url = "{1}Packages()?`$filter=tolower(Id)+eq+'{0}'&`$orderby=Id" -f $NuGetPackageId.ToLower(), $Source
+            Write-Debug "Trying NuGet query url: $Url"
             $XmlDoc = [xml]$WebClient.DownloadString($Url)
         }
         catch {
-            throw "Unable to download from NuGet feed: $($_.Exception.InnerException.Message)"
+            try {
+                $Url = "{1}Packages(Id='{0}')?`$orderby=Id" -f $NuGetPackageId, $Source
+                Write-Debug "Trying NuGet query url: $Url"
+                $XmlDoc = [xml]$WebClient.DownloadString($Url)
+            }
+            catch {
+                throw "Unable to download from NuGet feed: $($_.Exception.InnerException.Message)"
+            }
         }
 
         if ($PackageVersion) {
@@ -2110,7 +2133,7 @@ function TabExpansion {
             Get-PsGetModuleInfo -ModuleName "$lastword*" | % { $_.Id } | sort -Unique
         }
         elseif ( Test-Path -Path Function:\$tabExpansionBackup ) {
-            & $teBackup $line $lastWord
+            & $tabExpansionBackup $line $lastWord
         }
     }
 }

vendor/sources.json

@@ -1,8 +1,8 @@
 [
     {
         "name": "git-for-windows",
-        "version": "v2.16.2.windows.1",
+        "version": "v2.17.1.windows.2",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/PortableGit-2.16.2-64-bit.7z.exe"
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.17.1.windows.2/PortableGit-2.17.1.2-64-bit.7z.exe"
     },
     {
         "name": "clink",
@@ -11,8 +11,8 @@
     },
     {
         "name": "conemu-maximus5",
-        "version": "180206",
+        "version": "180528",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.02.06/ConEmuPack.180206.7z"
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.05.28/ConEmuPack.180528.7z"
     },
     {
         "name": "clink-completions",