add step label name

the default value of SGR 49 works best with both ConEmu and Windows Terminal, and both values don't take an effect on Cmder.
(ref: https://github.com/cmderdev/cmder/wiki/Seamless-Windows-Terminal-Integration)

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,162 @@
+name: "🐞 Bug report (encountered problems/errors)"
+description: Something is not working as it should
+title: "[Bug] "
+labels: [🐞 Bug report]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        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.
+
+        - You can find the version of Cmder.exe and ConEmu.exe binaries using Right Click → Properties → Details menu.
+
+  - type: textarea
+    id: version
+    attributes:
+      label: Version Information
+      description: |
+        Please write your Cmder and ConEmu version below.  If applicable, write down your Windows edition too.
+      placeholder: |
+        Cmder version:
+        Operating system:
+      value: |
+        Cmder version: 
+        Operating system: 
+      render: markdown
+    validations:
+      required: true
+
+  - type: dropdown
+    id: edition
+    attributes:
+      label: Cmder Edition
+      description: What edition of Cmder are you running?
+      options:
+        - Cmder Full (with Git)
+        - Cmder Mini
+        - N/A
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        Make sure that you have:
+
+        - Read both the README.md and the Wiki:
+
+          | **README.md** | **Wiki** |
+          | ------------- | -------- |
+          | 🌐 [Open Link](https://github.com/cmderdev/cmder/blob/master/README.md) | 🌐 [Open Link](https://github.com/cmderdev/cmder/wiki) |
+
+          (What you may be asking here could already be explained there!)
+          
+        - Searched for existing issues (including the **closed** ones) for similar problems here:
+
+          🗃 https://github.com/cmderdev/cmder/issues?q=is:issue
+
+        - Please understand that Cmder uses ConEmu as the default 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 having an issue with any of the **upstream technologies** that are used by Cmder, please make sure that the issue is reproducible _only_ when used in combination with Cmder.
+
+          We may not directly address the issues related to the following tools:
+              - **[Clink](https://github.com/chrisant996/clink)**, the default shell in Cmder
+              - **[ConEmu](https://github.com/Maximus5/ConEmu)**, the terminal emulator
+              - **[Git/MinGW](https://github.com/git-for-windows/git)**, which also provide *NIX tools (such as `ls`, `mv`, `cp`, etc)
+              - **[clink-completions](https://github.com/repos/vladimir-kotikov/clink-completions)**, which provide autocompletion for clink
+
+          We'll try our best to help you -- but we recommend creating an issue specifically at each of the corresponding repositories for the best result.
+
+          **👉 Note:** Try to reproduce the bug you're reporting, on a stand-alone edition of each tool, without using 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.
+
+        - Lastly, have a look at the official documentation for Cmder over our website, and our wiki.
+
+          Read more about Cmder on ConEmu docs:
+          https://conemu.github.io/en/cmder.html
+
+        #### Prerequisites before submitting an issue
+        - We do not support any versions older than the current release series, if you are using an older Cmder please update to the latest version first.
+        - Verify that the issue is not fixed and is reproducible in the **[latest official Cmder version](https://github.com/cmderdev/cmder/releases).**
+        - Check the **[current issues list](https://github.com/cmderdev/cmder/issues?q=is%3Aissue)** and perform a **search of the issue tracker (including closed ones)** to avoid posting a duplicate bug report.
+        - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/cmderdev/cmder/discussions)**, or the **[questions section](https://github.com/cmderdev/cmder/issues/new?template=question.yml)**.
+        - Verify that the **[wiki](https://github.com/cmderdev/cmder/wiki)** did not contain a suitable solution either.
+
+        Thank you for making sure you are opening a new valid issue! ♥
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of the issue
+      description: Provide a clear and concise description of the problem here.  Explain the actual behavior vs the expected behavior.
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: How to reproduce
+      description: Please provide reliable steps to reproduce the problem.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: false
+
+  - type: textarea
+    id: notes
+    attributes:
+      label: Additional context
+      description: Add screenshots, etc. (Anything that will provide more context about the problem)
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      description: Please check all boxes that apply
+      options:
+        - label: I have read the documentation.
+          required: true
+        - label: I have searched for similar issues and found none that describe my issue.
+          required: true
+        - label: I have reproduced the issue on the latest version of Cmder.
+          required: true
+        - label: I am certain my issues are not related to ConEmu, Clink, or other third-party tools that Cmder uses.
+          required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Some tips on how to write a good bug report with the required information.
+        - 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 that triggered the problem, if applicable.
+        - 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
+        - Avoid using ambiguous phrases like: doesn't work, there's 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.
+        - You can find the version of Cmder.exe and ConEmu.exe binaries using Right Click → Properties → Details menu.
+        - 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 comment 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.
+        - ⚠ 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!

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,9 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📄 Wiki
+    url: "https://github.com/cmderdev/cmder/wiki"
+    about: "Consult the wiki first, it might already contain the information you are looking for"
+
+  - name: 💬 Discussions
+    url: "https://github.com/cmderdev/cmder/discussions"
+    about: "Please ask questions related to usage/setup/support/non-issue development discussion in the Discussions section"

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,84 @@
+name: "⭐ Feature request (request for new functionality)"
+description: Help make Cmder even better
+title: "[Feature request] "
+labels: [⭐ Feature request]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for helping to improve 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 similar feature requests here:
+
+          🗃 https://github.com/cmderdev/cmder/issues?q=is:issue
+
+        - If you are opening the feature request regarding any of the **upstream technologies** that are used by Cmder, please open the feature request at the corresponding upstream repos instead:
+            - **[Clink](https://github.com/chrisant996/clink)**, the default shell in Cmder
+            - **[ConEmu](https://github.com/Maximus5/ConEmu)**, the terminal emulator
+            - **[Git/MinGW](https://github.com/git-for-windows/git)**, which also provide *NIX tools (such as `ls`, `mv`, `cp`, etc)
+            - **[clink-completions](https://github.com/repos/vladimir-kotikov/clink-completions)**, which provide autocompletion for clink
+
+        - If you would like to ask for guides on how to integrate Cmder with your favorite IDE of choice, or how to perform a 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 **[🌐 Labels](https://github.com/cmderdev/cmder/labels)**.
+
+          (Be sure to also check “Closed” issues in the labels section!)
+
+        - If you have a request to provide auto-complete support for a new tool, please post your request here instead:
+
+          https://github.com/vladimir-kotikov/clink-completions/issues
+
+        Thank you for making the Cmder project even better! ♥
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Suggestion
+      description: Describe the feature
+    validations:
+      required: true
+
+  - type: textarea
+    id: usecase
+    attributes:
+      label: Use case
+      description: Include a usage example of the feature
+    validations:
+      required: false
+
+  - type: textarea
+    id: notes
+    attributes:
+      label: Extra info/examples/attachments
+      description: Extra information, similar tools, etc.  If the feature is currently possible with a workaround
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      description: Please check all boxes that apply
+      options:
+        - label: I have read the documentation and made sure this feature doesn't already exist.
+          required: true
+        - label: I have searched for similar issues and found none that describe my feature request.
+          required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Some tips on how to write a better feature request
+        - Make sure the description is worded well enough to be understood, and with as much context and examples as possible.
+        - 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
+        - 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.

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,44 @@
+name: "❓ Question"
+description: Something is unclear or needs to be discussed
+labels: [❓ Question]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before you ask your question, please make sure you read and follow the following instructions carefully.
+
+        - Read both the README.md and the Wiki, as well as the existing issues:
+
+          | **README.md** | **Wiki** | **Issues** |
+          | ------------- | -------- | ---------- |
+          | 🌐 [Open Link](https://github.com/cmderdev/cmder/blob/master/README.md) | 🌐 [Open Link](https://github.com/cmderdev/cmder/wiki) | 🗃 [Open Link](https://github.com/cmderdev/cmder/issues?q=is:issue) |
+
+          (What you may be asking here could already be explained there!)
+
+        - If you would like to ask for guides on how to integrate Cmder with your favorite IDE of choice, or how to perform a 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 **[Labels](https://github.com/cmderdev/cmder/labels)**.
+
+          (Be sure to also check “Closed” issues in the labels section!)
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Question
+      description: What would you to ask about Cmder?
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      description: Please check all boxes that apply
+      options:
+        - label: I have read the documentation and made sure what I'm looking for isn't present, or is unclear.
+          required: true
+        - label: I have searched for similar issues, and either this question wasn't asked before, or I didn't find any that describe my question.
+          required: true

.github/issue_template.md

@@ -1,113 +0,0 @@
-<!--
-
-  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 both 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 uses ConEmu as the default
-    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 would like to ask for guides on how to integrate Cmder with
-    your favorite IDE of choice, or how to perform a 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 you have a request to provide auto-complete support for a new tool,
-    please post your request here:
-
-    https://github.com/vladimir-kotikov/clink-completions/issues
-
-  • If you are having an issue with any of the **upstream technologies**
-    that are used by Cmder, please make sure that the issue is reproducible
-    _only_ when used in combination with Cmder.
-
-    We may not directly address the issues related to the following tools:
-       - Clink, the default shell in Cmder
-       - ConEmu, the terminal emulator
-       - Git/MinGW, which also provide *NIX tools
-       - clink-completions, which provide autocompletion
-
-    The issues related to upstream technologies are labeled as 👆 [name].
-
-    We'll try our best to help you -- but we recommend creating an issue
-    specifically at each of the corresponding repositories for the best
-    result.
-
-    ► Try to reproduce the bug you're reporting, on a stand-alone edition
-      of each tool, without using 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.
-
-  • Lastly, have a look at official documentation for Cmder over
-    our website, and our wiki.
-
-    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 (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.
-    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.
-  - 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
-- [ ] Bug report (encountered problems/errors)
-- [ ] Feature request (request for new functionality)
-- [ ] Question
-
-### Version Information
-<!-- Please write your Cmder and ConEmu version below this line -->
-
-<!-- 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 below this line -->

.github/workflows/build.yml

@@ -0,0 +1,74 @@
+#---------------------------------#
+#      general configuration      #
+#---------------------------------#
+
+name: Build Cmder
+
+# Controls when the action will run. Triggers the workflow on push or pull request events but only for the main branch
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+env:
+  # Path to the root of the Cmder project.
+  CMDER_ROOT: ${{ github.workspace }}
+
+permissions:
+  contents: read
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+
+  build:
+    name: Build Project
+    runs-on: windows-latest
+
+    steps:
+    - name: Check out repository code (Action from GitHub)
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1
+
+    - name: Build Cmder Launcher
+      shell: pwsh
+      working-directory: scripts
+      run: .\build.ps1 -Compile -verbose
+
+    - name: Pack the built files
+      shell: pwsh
+      working-directory: scripts
+      run: .\pack.ps1 -verbose
+
+    - name: Upload artifact (cmder.zip)
+      uses: actions/upload-artifact@v3
+      with:
+        path: build/cmder.zip
+        name: cmder.zip
+        if-no-files-found: error
+
+    - name: Upload artifact (cmder.7z)
+      uses: actions/upload-artifact@v3
+      with:
+        path: build/cmder.7z
+        name: cmder.7z
+
+    - name: Upload artifact (cmder_mini.zip)
+      uses: actions/upload-artifact@v3
+      with:
+        path: build/cmder_mini.zip
+        name: cmder_mini.zip
+
+    - name: Upload artifact (hashes.txt)
+      uses: actions/upload-artifact@v3
+      with:
+        path: build/hashes.txt
+        name: hashes.txt

.github/workflows/tests.yml

@@ -0,0 +1,38 @@
+name: Run Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  
+defaults:
+  run:
+    shell: cmd
+    
+permissions:
+  contents: read
+  
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+
+  tests:
+    runs-on: windows-latest
+    continue-on-error: false
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Testing Clink Shell
+      run: |
+          cmd /c vendor\init.bat
+    - name: Testing PowerShell
+      run: |
+          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "Invoke-Expression '. ''vendor\profile.ps1'''"
+    - name: Testing Bash
+      run: |
+          bash vendor/cmder.sh

.github/workflows/vendor.yml

@@ -0,0 +1,62 @@
+name: Update Vendor
+
+on:
+  workflow_dispatch:
+  schedule:
+  # At 13:37 UTC every day.
+  - cron: '37 13 * * *'
+
+defaults:
+  run:
+    shell: pwsh
+
+permissions:
+  contents: read
+
+jobs:
+  vendor:
+
+    runs-on: windows-latest
+    continue-on-error: false
+    timeout-minutes: 15
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - id: make-changes
+      name: Checking for updates
+      run: |
+          $currentVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json)
+          . .\scripts\update.ps1 -verbose
+          Set-GHVariable -Name COUNT_UPDATED -Value $count
+          $newVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json)
+          $listUpdated = ""
+          $updateMessage = "| Name | Old Version | New Version |`n| :--- | ---- | ---- |`n"
+          foreach ($s in $newVersion) {
+            $oldVersion = ($currentVersion | Where-Object {$_.name -eq $s.name}).version
+            if ($s.version -ne $oldVersion) {
+              $listUpdated += "$($s.name) v$($s.version), "
+              $updateMessage += "| **$($s.name)** | $oldVersion | **$($s.version)** |`n"
+            }
+          }
+          if ($count -eq 0) { return }
+          Set-GHVariable -Name LIST_UPDATED -Value $listUpdated.Trim(', ')
+          echo "UPDATE_MESSAGE<<<EOF`n$updateMessage`n<EOF" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+
+    - uses: peter-evans/create-pull-request@v4
+      if: env.COUNT_UPDATED > 0
+      with:
+        title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies'
+        body: |
+          ### Automatically updated `${{ env.COUNT_UPDATED }}` dependencies:
+          ${{ env.UPDATE_MESSAGE }}
+          ---
+          Please verify and then **Merge** the pull request to update.
+        commit-message: 'Update vendored dependencies (${{ env.LIST_UPDATED }})'
+        branch: update-vendor
+        base: master

.gitignore

@@ -11,9 +11,11 @@ vendor/*/*
 !vendor/lib/*
 !vendor/*
 !vendor/psmodules/*
+vendor/git-for-windows
 
 config/*
 !config/Readme.md
+!config/profile.d/README.md
 
 config_user/*
 
@@ -21,8 +23,9 @@ Thumbs.db
 *.exe
 *.dll
 build/
-Version v*
+/Version *
 *.bak
 .github_changelog_generator
 launcher/.vs
 launcher/src/version.rc2
+.vs/*

CHANGELOG.md

@@ -1,5 +1,90 @@
 # Change Log
 
+## [1.3.20-unreleased](https://ci.appveyor.com/project/MartiUK/cmder/build/artifacts) (2022-03-17)
+
+### Changes
+
+- Update Git for Windows to 2.37.1
+- Update to Clink 1.3.36
+
+### Fixes
+
+- Fix #2740
+- Fix find and use latest Git install always using vendored Git.
+- Fix using Git from vendored Git and other Git for Windows tools from other Git in path.
+- Remove setting `term=cygwin` in `init.bat` to fix random `ABCD` characters when using arrow keys in `vim`.
+  - See: [Sometimes pressing on arrow keys prints symbols #1691](https://github.com/Maximus5/ConEmu/issues/169)
+- Fix Git prompt branch when using Git worktree.
+
+## [1.3.19](https://github.com/cmderdev/cmder/tree/v1.3.19) (2022-01-15)
+
+### Changes
+
+- Update Git for Windows to 2.34.0
+- Update to Clink 1.2.46
+- Update to stable ConEmu 210912
+- Do not rely on having a `%cmder_root%\config\cmder_prompt_config.lua`
+
+### Adds
+
+- PowerShell Git version Discovery - See #2373 for the full proposal.
+  - Find user installed Git on Path
+    - If found
+      - if newer than Cmder embedded Git
+        - Use its existing Path config and completely ignore embedded Git.
+      - Else if Cmder embedded Git exists and is newer
+        - Match User installed Git path config using Cmder embedded Git folders.
+    - Else if Cmder embedded Git exists
+      - Add Cmder embedded Git folders to the path.
+        - `$env:cmder_root\vendor\git-for-windows\cmd;$env:path`
+        - `$env:path;$env:cmder_root\vendor\git-for-windows\usr\bin`
+        - `$env:path;$env:cmder_root\vendor\git-for-windows\mingw64\bin`
+- Configurable prompt for `cmd.exe` sessions.  See `%cmder_root%\config\cmder_prompt_config.lua`
+  - Configurable colors
+  - Option to change `λ` to another character.
+  - Option to add `[user]@[host]` to the prompt
+  - Option to use of `~` to represent `$HOME` folder.
+  - Option to use folder name vs. full working directory path in prompt.
+  - Option to use single line prompt.
+
+### Fixes
+
+- Git prompt opt-out works better with additional changes to `clink-completions`
+
+## [1.3.18](https://github.com/cmderdev/cmder/tree/v1.3.18) (2021-3-26)
+
+### Changes
+
+- Update to Clink 1.1.45 to fix #2451, #2465,  and #2473
+- Update to ConEmu v21.03.04
+- `init.bat` auto migrates the history alias to use `clink history` if required.
+- Remove Tilde match from clink.lua in favor of builtin Clink capability.
+
+## [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)
@@ -32,7 +117,7 @@
 
 ### Changes
 
-* Update to Conemu 19.10.12
+* Update to ConEmu 19.10.12
 
 ### Adds
 
@@ -44,7 +129,7 @@
       status = false
     ```
 
-* #2174 `--` Syntax to pass command line options to Conemu.
+* #2174 `--` Syntax to pass command line options to ConEmu.
 * Disable Clink Logging
 * Add `~` tab completion.
 
@@ -53,7 +138,7 @@
 
 * 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 #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.
 
@@ -123,13 +208,13 @@
 ### Fixes
 
 * Replaces Cmder Release v1.3.9 which has been removed.
-* /c now completely separates user config including Conemu configuration. This enables true multi-user Cmder with no configuration collisions. See PR #1949.
+* /c now completely separates user config including ConEmu configuration. This enables true multi-user Cmder with no configuration collisions. See PR #1949.
 * Fix #1959 Start cmder "find" errors. See PR #1961.
 * Fix #1956 Git detection should use env from git install root. See PR #1969
 
 ### Adds
 
-* /m initially creates %cmder_root%/config/conemu-%computername%.xml for users that want per computer Conemu configuration with shared init scripts. See PR #1949.
+* /m initially creates %cmder_root%/config/ConEmu-%computername%.xml for users that want per computer ConEmu configuration with shared init scripts. See PR #1949.
 * /register now recognizes /c [path] and creates an appropriate Cmder Here shell context menu. See PR #1949.
 
 ## [1.3.8](https://github.com/cmderdev/cmder/tree/v1.3.8) (2018-11-10)
@@ -184,7 +269,7 @@
 * Profile.ps1 (#1796)
 * Fix lib base (#1794)
 * Little Changes
-* Fixed move of default conemu.xml to the vendor folder
+* Fixed move of default ConEmu.xml to the vendor folder
 * ignore all of config folder
 * move default comemu.xml to vendor folder
 * fixes
@@ -210,7 +295,7 @@
 
 ### Dmitri S. Guskov (2):
 
-* Powershell 5.1 compatibility
+* PowerShell 5.1 compatibility
 * Update profile.ps1
 
 ### Gregory Lucas (1):
@@ -245,8 +330,8 @@
 ### xiazeyu (4):
 
 * chore: unite slash
-* docs: update to latest useage
-* refactor: reduce global varible useage, fixed quote issue, added parameters support
+* docs: update to latest usage
+* refactor: reduce global variable usage, fixed quote issue, added parameters support
 * doc: fix typo
 
 ### xiazeyu_2011 (8):
@@ -315,14 +400,14 @@
 * Added ability to init.bat to accept command line args and documented them in README.md. Allows users to change the behaviour of init.bat without editing the file.
 
 | Argument                      | Description                                                                                      | Default                                |
-| ----------------------------- | ------------------------------------------------------------------------------------------------ | ------------------------------------- |
+| ----------------------------- | ------------------------------------------------------------------------------------------------ | -------------------------------------- |
 | /c [user cmder root]          | Enables user bin and config folders for 'Cmder as admin' sessions due to non-shared environment. | not set                                |
 | /d                            | Enables debug output.                                                                            | not set                                |
 | /git_install_root [file path] | User specified Git installation root path.                                                       | '%CMDER_ROOT%\vendor\Git-for-Windows'  |
 | /home [home folder]           | User specified folder path to set `%HOME%` environment variable.                                 | '%userprofile%'                        |
 | /max_depth [1-5]              | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`   | 1                                      |
 | /svn_ssh [path to ssh.exe]    | Define %SVN_SSH% so we can use git svn with ssh svn repositories.                                | '%GIT_INSTALL_ROOT%\bin\ssh.exe'       |
-| /user_aliases [file path]     | File path pointing to user aliases.                                                              | '%CMDER_ROOT%\config\user-liases.cmd' |
+| /user_aliases [file path]     | File path pointing to user aliases.                                                              | '%CMDER_ROOT%\config\user-aliases.cmd' |
 | /v                            | Enables verbose output.                                                                          | not set                                |
 
 * Added new `cmder.exe /C \<path\>` argument
@@ -330,7 +415,7 @@
   * To use run Cmder.exe with "/C" command line argument. Example: `cmder.exe /C %userprofile%\cmder_config`
   * To use run with `Cmder as Admin` sessions you must specify "/c" command line argument to `init.bat` in tasks. See [README.md](./Readme.md) for details.
   * Enables shared Cmder install with Non-Portable Individual User Config
-  * Supported by all supported shells (cmder, powershell, git bash, and external bash)
+  * Supported by all supported shells (cmder, PowerShell, git bash, and external bash)
   * This will create the following directory structure if it is missing.
 
     ```plain
@@ -367,7 +452,7 @@ This is the first Cmder release that comes with Git for Windows in the 64bit ver
 
 ## [1.3.4](https://github.com/cmderdev/cmder/releases/tag/v1.3.4) (2017-11-03)
 
-We now use a forked version of clink since it's original author is missing and we needed Windows 10 compat.
+We now use a forked version of clink since its original author is missing and we needed Windows 10 compatibility.
 
 **Updated components:**
 
@@ -375,13 +460,13 @@ We now use a forked version of clink since it's original author is missing and w
 
 **Fixed bugs:**
 
-* Fix lamda color after a ConEmu change: [a8d3261](https://github.com/cmderdev/cmder/commit/a8d32611a9b93cfb58f0318ae4b8041bc8a86c68)
+* Fix lambada color after a ConEmu change: [a8d3261](https://github.com/cmderdev/cmder/commit/a8d32611a9b93cfb58f0318ae4b8041bc8a86c68)
 * Compatible with Visual Studio Code (PowerShell): [\#1417](https://github.com/cmderdev/cmder/pull/1417)
 * Make default tasks respect "Startup directory for new process": [b58ff9b](https://github.com/cmderdev/cmder/commit/b58ff9bb539d7f908f427fa34f377e1513fcd825)
 
 ## [1.3.3](https://github.com/cmderdev/cmder/releases/tag/v1.3.3) (2017-10-28)
 
-We now use a forked version of clink since it's original author is missing and we needed Windows 10 compat.
+We now use a forked version of clink since its original author is missing and we needed Windows 10 compat.
 
 **Updated components:**
 
@@ -399,7 +484,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Make cmder auto start with windows and auto minimize to the status bar. [\#532](https://github.com/cmderdev/cmder/issues/532)
 * v1.2.0: Errors because of PowerShell execution policy [\#483](https://github.com/cmderdev/cmder/issues/483)
 * Updating Vendors with chocolatey [\#442](https://github.com/cmderdev/cmder/issues/442)
-* Alias without it's opposit [\#281](https://github.com/cmderdev/cmder/issues/281)
+* Alias without its opposite [\#281](https://github.com/cmderdev/cmder/issues/281)
 * Improve new UX [\#230](https://github.com/cmderdev/cmder/issues/230)
 * Different Font for the Lambda [\#211](https://github.com/cmderdev/cmder/issues/211)
 * Git Credential Cache [\#184](https://github.com/cmderdev/cmder/issues/184)
@@ -407,7 +492,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Include Scoop as package manager [\#42](https://github.com/cmderdev/cmder/issues/42)
 * Complete aliases on tab [\#38](https://github.com/cmderdev/cmder/issues/38)
 * Path ordering issue - wrong find.exe executes by default [\#37](https://github.com/cmderdev/cmder/issues/37)
-* User conemu cfg [\#1109](https://github.com/cmderdev/cmder/pull/1109) ([daxgames](https://github.com/daxgames))
+* User ConEmu cfg [\#1109](https://github.com/cmderdev/cmder/pull/1109) ([daxgames](https://github.com/daxgames))
 * Msys bash [\#702](https://github.com/cmderdev/cmder/pull/702) ([daxgames](https://github.com/daxgames))
 * Added code to check for the existence of a customized ini file.. [\#427](https://github.com/cmderdev/cmder/pull/427) ([kodybrown](https://github.com/kodybrown))
 * New build and pack scripts [\#152](https://github.com/cmderdev/cmder/pull/152) ([samvasko](https://github.com/samvasko))
@@ -439,7 +524,7 @@ We now use a forked version of clink since it's original author is missing and w
 * What is mintty in here? [\#1149](https://github.com/cmderdev/cmder/issues/1149)
 * No make [\#1146](https://github.com/cmderdev/cmder/issues/1146)
 * How can I set the path of cmder properly at the start ? [\#1136](https://github.com/cmderdev/cmder/issues/1136)
-* Powershell Slow Startup [\#1130](https://github.com/cmderdev/cmder/issues/1130)
+* PowerShell Slow Startup [\#1130](https://github.com/cmderdev/cmder/issues/1130)
 * python for cmder [\#1129](https://github.com/cmderdev/cmder/issues/1129)
 * Haskell repl \(ghci\) crashes only in cmder works elsewhere [\#1125](https://github.com/cmderdev/cmder/issues/1125)
 * Latest update causes `error: failed to push some refs to git@gitlab....` [\#1124](https://github.com/cmderdev/cmder/issues/1124)
@@ -531,14 +616,14 @@ We now use a forked version of clink since it's original author is missing and w
 * Tab autocompetion for git is inconsistent \(doesn't work with git add\) [\#885](https://github.com/cmderdev/cmder/issues/885)
 * Line-wrapping breaks when using backspace key in a git repo with Cmder mini and Git for Windows. [\#883](https://github.com/cmderdev/cmder/issues/883)
 * Cmder opens off screen [\#881](https://github.com/cmderdev/cmder/issues/881)
-* ctrl+l with powershell in quake mode clears the first prompt line as well [\#879](https://github.com/cmderdev/cmder/issues/879)
+* ctrl+l with PowerShell in quake mode clears the first prompt line as well [\#879](https://github.com/cmderdev/cmder/issues/879)
 * Enconding ? [\#877](https://github.com/cmderdev/cmder/issues/877)
 * the {cmd} task [\#876](https://github.com/cmderdev/cmder/issues/876)
 * Failed to start cmder, app crashed [\#871](https://github.com/cmderdev/cmder/issues/871)
 * Cmder Windows Pinning Issue \[weird\] [\#869](https://github.com/cmderdev/cmder/issues/869)
 * Why not use @ECHO OFF? [\#868](https://github.com/cmderdev/cmder/issues/868)
 * alias with && doesn't work [\#859](https://github.com/cmderdev/cmder/issues/859)
-* Having trouble with packaged conemu install, how can I point to a different one? [\#858](https://github.com/cmderdev/cmder/issues/858)
+* Having trouble with packaged ConEmu install, how can I point to a different one? [\#858](https://github.com/cmderdev/cmder/issues/858)
 * path entry for \<git\>/cmd instead of \<git\>/bin? [\#853](https://github.com/cmderdev/cmder/issues/853)
 * Cmder lists path on window resize. [\#851](https://github.com/cmderdev/cmder/issues/851)
 * Alias with multi-word git commit message not working [\#847](https://github.com/cmderdev/cmder/issues/847)
@@ -558,7 +643,7 @@ We now use a forked version of clink since it's original author is missing and w
 * When will the next version be available? [\#811](https://github.com/cmderdev/cmder/issues/811)
 * Netcat is missing [\#810](https://github.com/cmderdev/cmder/issues/810)
 * how to use /? to get the help doc in the `cmder` [\#808](https://github.com/cmderdev/cmder/issues/808)
-* \[Enhancement\] Powershell and Babun \(cygwin + zsh\) [\#807](https://github.com/cmderdev/cmder/issues/807)
+* \[Enhancement\] PowerShell and Babun \(cygwin + zsh\) [\#807](https://github.com/cmderdev/cmder/issues/807)
 * Cmder - Warning: Missing git support [\#806](https://github.com/cmderdev/cmder/issues/806)
 * iul [\#800](https://github.com/cmderdev/cmder/issues/800)
 * Update clink settings [\#793](https://github.com/cmderdev/cmder/issues/793)
@@ -615,16 +700,16 @@ We now use a forked version of clink since it's original author is missing and w
 * Cannot switch to mapped network drive [\#649](https://github.com/cmderdev/cmder/issues/649)
 * Ctrl + D? [\#648](https://github.com/cmderdev/cmder/issues/648)
 * Is there any hotkey jump to "Search" box? [\#647](https://github.com/cmderdev/cmder/issues/647)
-* File /vendor/conemu-maximus5/ConEmu.exe not found. [\#646](https://github.com/cmderdev/cmder/issues/646)
-* As admin CMDER_ROOT not set in Powershell [\#643](https://github.com/cmderdev/cmder/issues/643)
+* File /vendor/ConEmu-maximus5/ConEmu.exe not found. [\#646](https://github.com/cmderdev/cmder/issues/646)
+* As admin CMDER_ROOT not set in PowerShell [\#643](https://github.com/cmderdev/cmder/issues/643)
 * Emoji support [\#642](https://github.com/cmderdev/cmder/issues/642)
 * Having ls, cat, etc [\#641](https://github.com/cmderdev/cmder/issues/641)
 * Cmder having Permission Errors for Windows 10 [\#640](https://github.com/cmderdev/cmder/issues/640)
-* Powershell - Msys Aliases [\#639](https://github.com/cmderdev/cmder/issues/639)
+* PowerShell - Msys Aliases [\#639](https://github.com/cmderdev/cmder/issues/639)
 * Problem with install on window 7? [\#637](https://github.com/cmderdev/cmder/issues/637)
 * Invoke-Expression : The term 'Invoke-Expression' is not recognized [\#636](https://github.com/cmderdev/cmder/issues/636)
 * it doesn't like Docker [\#631](https://github.com/cmderdev/cmder/issues/631)
-* Latest release : Windows 7 : Windows cannot find ".../vendor/conemu-maximus5/CpmE,u.exe" [\#629](https://github.com/cmderdev/cmder/issues/629)
+* Latest release : Windows 7 : Windows cannot find ".../vendor/ConEmu-maximus5/CpmE,u.exe" [\#629](https://github.com/cmderdev/cmder/issues/629)
 * Strange Vim behaviour after Git for Windows upgrade [\#628](https://github.com/cmderdev/cmder/issues/628)
 * msysGit has been superseded ,consider to switch to Git for Windows 2.x? [\#627](https://github.com/cmderdev/cmder/issues/627)
 * tail command not found [\#625](https://github.com/cmderdev/cmder/issues/625)
@@ -639,7 +724,7 @@ We now use a forked version of clink since it's original author is missing and w
 * api-ms-win-crt-runtime-l1-1-0.dll is missing error \(Windows 8.1\) [\#604](https://github.com/cmderdev/cmder/issues/604)
 * Prevent inactive cmder windows to be dimmed [\#603](https://github.com/cmderdev/cmder/issues/603)
 * Git for Windows 2.5 [\#602](https://github.com/cmderdev/cmder/issues/602)
-* Incompatibility with conemu 150716+ / double pinned icon on taskbar [\#599](https://github.com/cmderdev/cmder/issues/599)
+* Incompatibility with ConEmu 150716+ / double pinned icon on taskbar [\#599](https://github.com/cmderdev/cmder/issues/599)
 * Cant get it working on windows xp [\#598](https://github.com/cmderdev/cmder/issues/598)
 * ls parameters error in Windows 10 [\#597](https://github.com/cmderdev/cmder/issues/597)
 * Resizing split windows [\#596](https://github.com/cmderdev/cmder/issues/596)
@@ -677,7 +762,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Error on Windows 7 [\#534](https://github.com/cmderdev/cmder/issues/534)
 * api-ms-win-crt-runtime l1-109.dll is missing [\#531](https://github.com/cmderdev/cmder/issues/531)
 * Git checks for 'commits' every time a folder is changed? [\#529](https://github.com/cmderdev/cmder/issues/529)
-* Powershell tab title issue [\#528](https://github.com/cmderdev/cmder/issues/528)
+* PowerShell tab title issue [\#528](https://github.com/cmderdev/cmder/issues/528)
 * conhost.exe keeps on crashing. [\#527](https://github.com/cmderdev/cmder/issues/527)
 * storage in userprofile \(instead of fixed config dir relative to the executable\) [\#526](https://github.com/cmderdev/cmder/issues/526)
 * Cmder crashes when AVG falsely flags it as a virus. [\#522](https://github.com/cmderdev/cmder/issues/522)
@@ -747,7 +832,7 @@ We now use a forked version of clink since it's original author is missing and w
 * feature request vim-airline [\#306](https://github.com/cmderdev/cmder/issues/306)
 * Integrate PSReadLine [\#301](https://github.com/cmderdev/cmder/issues/301)
 * Full Screen [\#295](https://github.com/cmderdev/cmder/issues/295)
-* Configure Powershell to match CMD [\#294](https://github.com/cmderdev/cmder/issues/294)
+* Configure PowerShell to match CMD [\#294](https://github.com/cmderdev/cmder/issues/294)
 * Tab Close on CTRL-W [\#293](https://github.com/cmderdev/cmder/issues/293)
 * v1.1.4.1 /REGISTER ALL has broken icon [\#292](https://github.com/cmderdev/cmder/issues/292)
 * CD in root not working.. [\#289](https://github.com/cmderdev/cmder/issues/289)
@@ -886,7 +971,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Pinning Cmder to taskbar doesn't work as expected [\#39](https://github.com/cmderdev/cmder/issues/39)
 * Prompt does not work with clink 0.4 [\#35](https://github.com/cmderdev/cmder/issues/35)
 * vendor/init.bat fails on paths with spaces [\#28](https://github.com/cmderdev/cmder/issues/28)
-* "windows cannot find ...\cmder\vendor/conemu-maximus5/ConEmu.exe" [\#27](https://github.com/cmderdev/cmder/issues/27)
+* "windows cannot find ...\cmder\vendor/ConEmu-maximus5/ConEmu.exe" [\#27](https://github.com/cmderdev/cmder/issues/27)
 * Issue with SSH and tmux [\#25](https://github.com/cmderdev/cmder/issues/25)
 * PWD, VI, VIM commands don't work on windows 7. [\#23](https://github.com/cmderdev/cmder/issues/23)
 * Include icon [\#21](https://github.com/cmderdev/cmder/issues/21)
@@ -903,7 +988,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Unable to `cd` to another drive [\#6](https://github.com/cmderdev/cmder/issues/6)
 * cant change start directory [\#4](https://github.com/cmderdev/cmder/issues/4)
 * lalt + arrow left/right not working as a macro hotkey [\#3](https://github.com/cmderdev/cmder/issues/3)
-* alt gr + 2 opens new powershell [\#2](https://github.com/cmderdev/cmder/issues/2)
+* alt gr + 2 opens new PowerShell [\#2](https://github.com/cmderdev/cmder/issues/2)
 * Gvim preferences are not used in {cmd} [\#1](https://github.com/cmderdev/cmder/issues/1)
 
 **Merged pull requests:**
@@ -927,7 +1012,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Bump clink-completions to 0.3.1 [\#992](https://github.com/cmderdev/cmder/pull/992) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
 * Fix git branch name never shown as dirty [\#974](https://github.com/cmderdev/cmder/pull/974) ([janschulz](https://github.com/janschulz))
 * Disable history switching behavior of ctrl+tab. Sequential switching. [\#963](https://github.com/cmderdev/cmder/pull/963) ([Jackbennett](https://github.com/Jackbennett))
-* Register cmder in the context menu from powershell [\#962](https://github.com/cmderdev/cmder/pull/962) ([Jackbennett](https://github.com/Jackbennett))
+* Register cmder in the context menu from PowerShell [\#962](https://github.com/cmderdev/cmder/pull/962) ([Jackbennett](https://github.com/Jackbennett))
 * cmd: change the prompt in lua [\#961](https://github.com/cmderdev/cmder/pull/961) ([janschulz](https://github.com/janschulz))
 * Custom prompt hooks protected from later overwriting [\#952](https://github.com/cmderdev/cmder/pull/952) ([Jackbennett](https://github.com/Jackbennett))
 * Update clink-completions to 0.3.0 [\#946](https://github.com/cmderdev/cmder/pull/946) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
@@ -971,10 +1056,10 @@ We now use a forked version of clink since it's original author is missing and w
 * Do not overwrite aliases on update [\#735](https://github.com/cmderdev/cmder/pull/735) ([janschulz](https://github.com/janschulz))
 * Added check for git install path in init.bat. [\#734](https://github.com/cmderdev/cmder/pull/734) ([chase-miller](https://github.com/chase-miller))
 * Fix icons [\#731](https://github.com/cmderdev/cmder/pull/731) ([daxgames](https://github.com/daxgames))
-* Fixed - Powershell vim/vim alias opening a new tab when editing a file [\#729](https://github.com/cmderdev/cmder/pull/729) ([daxgames](https://github.com/daxgames))
-* Added vi/vim aliases and fixed powershell startup errors [\#726](https://github.com/cmderdev/cmder/pull/726) ([daxgames](https://github.com/daxgames))
+* Fixed - PowerShell vim/vim alias opening a new tab when editing a file [\#729](https://github.com/cmderdev/cmder/pull/729) ([daxgames](https://github.com/daxgames))
+* Added vi/vim aliases and fixed PowerShell startup errors [\#726](https://github.com/cmderdev/cmder/pull/726) ([daxgames](https://github.com/daxgames))
 * Release 1.3 [\#723](https://github.com/cmderdev/cmder/pull/723) ([MartiUK](https://github.com/MartiUK))
-* Update to conemu 151119 [\#722](https://github.com/cmderdev/cmder/pull/722) ([MartiUK](https://github.com/MartiUK))
+* Update to ConEmu 151119 [\#722](https://github.com/cmderdev/cmder/pull/722) ([MartiUK](https://github.com/MartiUK))
 * Disable appveyor test search [\#720](https://github.com/cmderdev/cmder/pull/720) ([MartiUK](https://github.com/MartiUK))
 * Fix gitter webhook [\#719](https://github.com/cmderdev/cmder/pull/719) ([MartiUK](https://github.com/MartiUK))
 * Publish appveyor artefacts [\#718](https://github.com/cmderdev/cmder/pull/718) ([MartiUK](https://github.com/MartiUK))
@@ -984,7 +1069,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Upgrade clink-completions to 0.2.1 [\#676](https://github.com/cmderdev/cmder/pull/676) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
 * Enable the '/single' switch \(\#577\) [\#673](https://github.com/cmderdev/cmder/pull/673) ([DoCode](https://github.com/DoCode))
 * Fixed problem with Invoke-Expression [\#667](https://github.com/cmderdev/cmder/pull/667) ([Pireax](https://github.com/Pireax))
-* Add user startup file for powershell [\#666](https://github.com/cmderdev/cmder/pull/666) ([Pireax](https://github.com/Pireax))
+* Add user startup file for PowerShell [\#666](https://github.com/cmderdev/cmder/pull/666) ([Pireax](https://github.com/Pireax))
 * Build from behind proxy & appveyor [\#665](https://github.com/cmderdev/cmder/pull/665) ([MartiUK](https://github.com/MartiUK))
 * Fix init.bat generation [\#663](https://github.com/cmderdev/cmder/pull/663) ([janschulz](https://github.com/janschulz))
 * Upgrade clink-completions to 0.2.0 [\#653](https://github.com/cmderdev/cmder/pull/653) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
@@ -1002,13 +1087,13 @@ We now use a forked version of clink since it's original author is missing and w
 * Enhance Path in profile.ps1 [\#575](https://github.com/cmderdev/cmder/pull/575) ([Bobo1239](https://github.com/Bobo1239))
 * Fixed: 'Enable-GitColors is Obsolete...' warning [\#569](https://github.com/cmderdev/cmder/pull/569) ([eeree](https://github.com/eeree))
 * Update .gitignore [\#548](https://github.com/cmderdev/cmder/pull/548) ([thomgit](https://github.com/thomgit))
-* Add `-ExecutionPolicy Bypass` to powershell tasks [\#543](https://github.com/cmderdev/cmder/pull/543) ([malobre](https://github.com/malobre))
+* Add `-ExecutionPolicy Bypass` to PowerShell tasks [\#543](https://github.com/cmderdev/cmder/pull/543) ([malobre](https://github.com/malobre))
 * Remove depreciated Enable-GitColors in posh-git [\#517](https://github.com/cmderdev/cmder/pull/517) ([bondz](https://github.com/bondz))
 * Fix cleanup script. [\#479](https://github.com/cmderdev/cmder/pull/479) ([MartiUK](https://github.com/MartiUK))
 * Fix link to msysgit's site. Google's repo was moved or removed. [\#465](https://github.com/cmderdev/cmder/pull/465) ([TheMolkaPL](https://github.com/TheMolkaPL))
 * Update sources.json [\#451](https://github.com/cmderdev/cmder/pull/451) ([MartiUK](https://github.com/MartiUK))
 * Merge development into master for 1.2 [\#450](https://github.com/cmderdev/cmder/pull/450) ([MartiUK](https://github.com/MartiUK))
-* Helper function using powershell to register the cmder context menu [\#441](https://github.com/cmderdev/cmder/pull/441) ([Jackbennett](https://github.com/Jackbennett))
+* Helper function using PowerShell to register the cmder context menu [\#441](https://github.com/cmderdev/cmder/pull/441) ([Jackbennett](https://github.com/Jackbennett))
 * git and Posh-git check [\#440](https://github.com/cmderdev/cmder/pull/440) ([Jackbennett](https://github.com/Jackbennett))
 * Improves performance of prompt filtering [\#438](https://github.com/cmderdev/cmder/pull/438) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
 * Preview PR for including external completions into Cmder [\#434](https://github.com/cmderdev/cmder/pull/434) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
@@ -1020,7 +1105,7 @@ We now use a forked version of clink since it's original author is missing and w
 * Added git shell task. [\#422](https://github.com/cmderdev/cmder/pull/422) ([ragekit](https://github.com/ragekit))
 * Public site docs update matching the repo readme [\#411](https://github.com/cmderdev/cmder/pull/411) ([Jackbennett](https://github.com/Jackbennett))
 * Install steps clarity [\#410](https://github.com/cmderdev/cmder/pull/410) ([Jackbennett](https://github.com/Jackbennett))
-* Update Conemu \<preview release\>, update clink 4.4 [\#407](https://github.com/cmderdev/cmder/pull/407) ([Jackbennett](https://github.com/Jackbennett))
+* Update ConEmu \<preview release\>, update clink 4.4 [\#407](https://github.com/cmderdev/cmder/pull/407) ([Jackbennett](https://github.com/Jackbennett))
 * Use a -Full parameter to download all sources rather than the minimum [\#406](https://github.com/cmderdev/cmder/pull/406) ([Jackbennett](https://github.com/Jackbennett))
 * Adding mercuial prompt [\#401](https://github.com/cmderdev/cmder/pull/401) ([utek](https://github.com/utek))
 * Handle quoted paths [\#398](https://github.com/cmderdev/cmder/pull/398) ([mikesigs](https://github.com/mikesigs))
@@ -1039,15 +1124,15 @@ We now use a forked version of clink since it's original author is missing and w
 * Add an unalias command [\#313](https://github.com/cmderdev/cmder/pull/313) ([glucas](https://github.com/glucas))
 * Revert "Add single mode support." [\#312](https://github.com/cmderdev/cmder/pull/312) ([MartiUK](https://github.com/MartiUK))
 * FIX CMDER_ROOT for admin launch [\#311](https://github.com/cmderdev/cmder/pull/311) ([sescandell](https://github.com/sescandell))
-* Lambda color in powershell was changed to DarkGray [\#308](https://github.com/cmderdev/cmder/pull/308) ([SheGe](https://github.com/SheGe))
+* Lambda color in PowerShell was changed to DarkGray [\#308](https://github.com/cmderdev/cmder/pull/308) ([SheGe](https://github.com/SheGe))
 * Add option to reload aliases from file [\#304](https://github.com/cmderdev/cmder/pull/304) ([glucas](https://github.com/glucas))
 * Clean aliases script [\#300](https://github.com/cmderdev/cmder/pull/300) ([melku](https://github.com/melku))
 * Adding history alias [\#299](https://github.com/cmderdev/cmder/pull/299) ([robgithub](https://github.com/robgithub))
 * Fixes the ambiguity about notice and parameter [\#298](https://github.com/cmderdev/cmder/pull/298) ([LeoColomb](https://github.com/LeoColomb))
 * Fixed small issue in README [\#296](https://github.com/cmderdev/cmder/pull/296) ([brunowego](https://github.com/brunowego))
-* Fixes small Powershell' loader issues [\#273](https://github.com/cmderdev/cmder/pull/273) ([LeoColomb](https://github.com/LeoColomb))
+* Fixes small PowerShell' loader issues [\#273](https://github.com/cmderdev/cmder/pull/273) ([LeoColomb](https://github.com/LeoColomb))
 * Update Dev Branch [\#272](https://github.com/cmderdev/cmder/pull/272) ([MartiUK](https://github.com/MartiUK))
-* Add custom loader for Powershell & improve its implementation [\#271](https://github.com/cmderdev/cmder/pull/271) ([LeoColomb](https://github.com/LeoColomb))
+* Add custom loader for PowerShell & improve its implementation [\#271](https://github.com/cmderdev/cmder/pull/271) ([LeoColomb](https://github.com/LeoColomb))
 * Add single mode support. [\#256](https://github.com/cmderdev/cmder/pull/256) ([TheCjw](https://github.com/TheCjw))
 * Revert "Start in the HOME folder." [\#253](https://github.com/cmderdev/cmder/pull/253) ([MartiUK](https://github.com/MartiUK))
 * Ensure-Exists is necessary for build.ps1, add it back. [\#249](https://github.com/cmderdev/cmder/pull/249) ([narnaud](https://github.com/narnaud))

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
 

Cmder.bat

@@ -4,8 +4,12 @@ SET CMDER_ROOT=%~dp0
 :: Remove Trailing '\'
 @if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%
 
+if not exist "%CMDER_ROOT%\config\user_ConEmu.xml" (
+  copy "%CMDER_ROOT%\vendor\ConEmu.xml.default" "%CMDER_ROOT%\config\user_ConEmu.xml"
+)
+
 if exist "%~1" (
     start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
 ) else (
-    start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
+    start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\user_ConEmu.xml"
 )

README.md

@@ -1,8 +1,8 @@
 # Cmder
 
-[![Join the chat at https://gitter.im/cmderdev/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?branch=master&svg=true)](https://ci.appveyor.com/project/MartiUK/cmder)
+[![Join the chat at https://gitter.im/cmderdev/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?branch=master&svg=true)](https://ci.appveyor.com/project/MartiUK/cmder) [![Build Status](https://github.com/cmderdev/cmder/actions/workflows/build.yml/badge.svg)](https://github.com/cmderdev/cmder/actions/workflows/build.yml)
 
-Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, comes with a Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) (further enhanced by [clink-completions](https://github.com/vladimir-kotikov/clink-completions)) and a custom prompt layout.
+Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, comes with a Monokai color scheme, amazing [clink](https://chrisant996.github.io/clink/) (further enhanced by [clink-completions](https://github.com/vladimir-kotikov/clink-completions)) and a custom prompt layout.
 
 ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png)
 
@@ -23,10 +23,10 @@ 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 and custom app folders into the `%cmder_root%\bin`. See: [opt/README.md](./bin/README)
+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)
+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.
@@ -52,7 +52,7 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 
 
 | Argument                  | Description                                                                              |
-| -------------------       | -----------------------------------------------------------------------                  |
+| ------------------------- | -----------------------------------------------------------------------                  |
 | `/C [user_root_path]`     | Individual user Cmder root folder.  Example: `%userprofile%\cmder_config`                |
 | `/M`                      | Use `conemu-%computername%.xml` for ConEmu settings storage instead of `user_conemu.xml` |
 | `/REGISTER [ALL, USER]`   | Register a Windows Shell Menu shortcut.                                                  |
@@ -60,7 +60,7 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 | `/SINGLE`                 | Start Cmder in single mode.                                                              |
 | `/START [start_path]`     | Folder path to start in.                                                                 |
 | `/TASK [task_name]`       | Task to start after launch.                                                              |
-| `/X [ConEmu extras pars]` | Forwads parameters to ConEmu                                                             |
+| `/X [ConEmu extras pars]` | Forwards parameters to ConEmu                                                            |
 
 ## Context Menu Integration
 
@@ -134,7 +134,27 @@ 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` Prompt Config File
+
+The default Cmder shell `cmd::Cmder` prompt is customized using `Clink` and is configured by editing a config file that exists in one of two locations:
+
+- Single User Portable Config `%CMDER_ROOT%\config\cmder_prompt_config.lua`
+- Shared Cmder install with Non-Portable Individual User Config `%CMDER_USER_CONFIG%\cmder_prompt_config.lua`
+
+If your Cmder setup does not have this file create it from `%CMDER_ROOT%\vendor\cmder_prompt_config.lua.default`
+
+Customizations include:
+
+- Colors.
+- Single/Multi-line.
+- Full path/Folder only.
+- `[user]@[host]` to the beginning of the prompt.
+- `~` for home directory.
+- `λ` symbol
+
+Documentation is in the file for each setting.
 
 ### Changing Cmder Default `cmd.exe` Shell Startup Behaviour Using Task Arguments
 
@@ -163,9 +183,9 @@ 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                                |
+| (custom arguments)              | User defined arguments processed by `cexec`. Type `cexec /?` for more usage.                                                                      | not set                                |
 
 ### Cmder Shell User Config
 Single user portable configuration is possible using the cmder specific shell config files.  Edit the below files to add your own configuration:
@@ -206,14 +226,14 @@ You can define simple aliases for `cmd.exe` sessions with a command like `alias
 
 Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](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
@@ -249,7 +269,7 @@ If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_R
 
 Cmder is by default shipped with a vendored Git installation.  On each instance of launching Cmder, an attempt is made to locate any other user provided Git binaries. Upon finding a `git.exe` binary, Cmder further compares its version against the vendored one _by executing_ it. The vendored `git.exe` binary is _only_ used when it is more recent than the user-installed one.
 
-You may use your favorite version of Git by including its path in the `%PATH%` enviroment variable.  Moreover, the **Mini** edition of Cmder (found on the [downloads page](https://github.com/cmderdev/cmder/releases)) excludes any vendored Git binaries.
+You may use your favorite version of Git by including its path in the `%PATH%` environment 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, WSL, or Git for Windows SDK with Cmder.
 

appveyor.yml

@@ -15,7 +15,7 @@ branches:
 #---------------------------------#
 
 # Operating system (build VM template)
-os: Visual Studio 2017
+os: Visual Studio 2022
 
 #---------------------------------#
 #       build configuration       #

config/profile.d/README.md

@@ -0,0 +1,3 @@
+## Profile.d Folder
+
+* Files in this folder named `*.{sh|cmd|ps1}`: Will be executed by the appropriate shell when starting the shell.

launcher/CmderLauncher.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0

launcher/CmderLauncher.vcxproj

@@ -22,13 +22,13 @@
     <ProjectGuid>{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CmderLauncher</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -36,12 +36,12 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -49,7 +49,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -95,6 +95,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <!-- <AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> -->
     </Link>
     <Manifest>
       <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -121,12 +122,13 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <!-- <AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> -->
     </Link>
     <Manifest>
       <AdditionalManifestFiles>src/app.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PostBuildEvent>
-      <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\$(TargetFileName)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -176,7 +178,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\Resource.rc">
+    <ResourceCompile Include="src\resource.rc">
       <FileType>RC</FileType>
     </ResourceCompile>
   </ItemGroup>

launcher/src/CmderLauncher.cpp

@@ -9,6 +9,7 @@
 #include <iostream>
 
 #pragma comment(lib, "Shlwapi.lib")
+#pragma comment(lib, "comctl32.lib")
 #pragma warning( disable : 4091 )
 
 #ifndef UNICODE
@@ -31,6 +32,39 @@
 
 #define FAIL_ON_ERROR(x) { DWORD ec; if ((ec = (x)) != ERROR_SUCCESS) { ShowErrorAndExit(ec, __WFUNCTION__, __LINE__); } }
 
+void TaskDialogOpen( PCWSTR mainStr, PCWSTR contentStr )
+{
+
+	HRESULT hr = NULL;
+
+	TASKDIALOGCONFIG tsk = {sizeof(tsk)};
+
+	HWND hOwner = NULL;
+	HINSTANCE hInstance = GetModuleHandle(NULL);
+	PCWSTR tskTitle = MAKEINTRESOURCE(IDS_TITLE);
+
+	tsk.hInstance = hInstance;
+	tsk.pszMainIcon = MAKEINTRESOURCE(IDI_CMDER);
+	tsk.pszWindowTitle = tskTitle;
+	tsk.pszMainInstruction = mainStr;
+	tsk.pszContent = contentStr;
+
+	TASKDIALOG_BUTTON btns[1] = {
+		{ IDOK,     L"OK" }
+	};
+
+	tsk.dwFlags        = TDF_ALLOW_DIALOG_CANCELLATION|TDF_ENABLE_HYPERLINKS;
+	tsk.pButtons       = btns;
+	tsk.cButtons       = _countof(btns);
+
+	tsk.hwndParent     = hOwner;
+
+	int selectedButtonId = IDOK;
+
+	hr = TaskDialogIndirect( &tsk, &selectedButtonId, NULL, NULL );
+
+}
+
 void ShowErrorAndExit(DWORD ec, const wchar_t * func, int line)
 {
 	wchar_t * buffer;
@@ -71,7 +105,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 iconPath = 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 title = 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 };
@@ -98,6 +132,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 
 	std::wstring cmderStart = path;
 	std::wstring cmderTask = taskName;
+	std::wstring cmderTitle = title;
 	std::wstring cmderConEmuArgs = conemu_args;
 
 	std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
@@ -250,7 +285,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 				{
 					MessageBox(NULL,
 						(GetLastError() == ERROR_ACCESS_DENIED)
-						? L"Failed to copy conig/ConEmu-%COMPUTERNAME%.xml file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+						? L"Failed to copy config/ConEmu-%COMPUTERNAME%.xml file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
 						: L"Failed to copy config/ConEmu-%COMPUTERNAME%.xml file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
 					exit(1);
 				}
@@ -378,7 +413,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
 	}
 
-	swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder", args, icoPath);
+	swprintf_s(args, L"%s /Icon \"%s\"", args, icoPath);
 
 	if (!streqi(cmderStart.c_str(), L""))
 	{
@@ -395,6 +430,11 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str());
 	}
 
+	if (!streqi(cmderTitle.c_str(), L""))
+	{
+		swprintf_s(args, L"%s /title \"%s\"", args, cmderTitle.c_str());
+	}
+
 	if (cfgRoot.length() != 0)
 	{
 		swprintf_s(args, L"%s  -loadcfgfile \"%s\"", args, userConEmuCfgPath);
@@ -540,6 +580,7 @@ struct cmderOptions
 	std::wstring cmderCfgRoot = L"";
 	std::wstring cmderStart = L"";
 	std::wstring cmderTask = L"";
+	std::wstring cmderTitle = L"Cmder";
 	std::wstring cmderIcon = L"";
 	std::wstring cmderRegScope = L"USER";
 	std::wstring cmderConEmuArgs = L"";
@@ -602,6 +643,11 @@ cmderOptions GetOption()
 				cmderOptions.cmderTask = szArgList[i + 1];
 				i++;
 			}
+			else if (_wcsicmp(L"/title", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderTitle = szArgList[i + 1];
+				i++;
+			}
 			else if (_wcsicmp(L"/icon", szArgList[i]) == 0)
 			{
 				cmderOptions.cmderIcon = szArgList[i + 1];
@@ -673,16 +719,25 @@ 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    /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    /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;
 			}
 		}
+
+	}
+
+	if (cmderOptions.error == true)
+	{
+		wchar_t validOptions[512];
+		HMODULE hMod = GetModuleHandle(NULL);
+		LoadString(hMod, IDS_SWITCHES, validOptions, 512);
+
+		// display list of valid options on unrecognized parameter
+		TaskDialogOpen( L"Unrecognized parameter.", validOptions );
 	}
 
 	LocalFree(szArgList);
@@ -721,7 +776,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
 	}
 
 	return 0;

launcher/src/resource.rc

@@ -9,6 +9,7 @@
 
 #include "resource.h"
 #include "version.rc2"
+#include "strings.rc2"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

launcher/src/strings.rc2

@@ -0,0 +1,12 @@
+
+/////////////////////////////////////////////////////////////////////////////
+// Corresponding ids should be defined in `resource.h` file.
+
+STRINGTABLE
+{
+	IDS_TITLE             "Cmder Launcher"
+
+	IDS_SWITCHES          L"Valid options:\n\n    /c [CMDER User Root Path]\n    /task [ConEmu Task Name]\n    /icon [CMDER Icon Path]\n    [/start [Start in Path] | [Start in Path]]\n    /single\n    /m\n    /x [ConEmu extra arguments]\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
+}
+
+/////////////////////////////////////////////////////////////////////////////

scripts/build.ps1

@@ -11,11 +11,15 @@
 .EXAMPLE
     .\build.ps1
 
-    Executes the default build for Cmder; Conemu, clink. This is equivalent to the "minimum" style package in the releases
+    Executes the default build for Cmder; ConEmu, clink. This is equivalent to the "minimum" style package in the releases
 .EXAMPLE
     .\build.ps1 -Compile
 
     Recompile the launcher executable if you have the requisite build tools for C++ installed.
+.EXAMPLE
+    .\build.ps1 -Compile -NoVendor
+
+    Skip all downloads and only build launcher.
 .EXAMPLE
     .\build -verbose
 
@@ -29,7 +33,7 @@
     Samuel Vasko, Jack Bennett
     Part of the Cmder project.
 .LINK
-    http://cmder.net/ - Project Home
+    http://cmder.app/ - Project Home
 #>
 [CmdletBinding(SupportsShouldProcess=$true)]
 Param(
@@ -38,61 +42,85 @@ Param(
     # -whatif switch to not actually make changes
 
     # Path to the vendor configuration source file
-    [string]$sourcesPath = "..\vendor\sources.json",
+    [string]$sourcesPath = "$PSScriptRoot\..\vendor\sources.json",
 
     # Vendor folder location
-    [string]$saveTo = "..\vendor\",
+    [string]$saveTo = "$PSScriptRoot\..\vendor\",
 
     # Launcher folder location
-    [string]$launcher = "..\launcher",
+    [string]$launcher = "$PSScriptRoot\..\launcher",
 
     # Config folder location
-    [string]$config = "..\config",
+    [string]$config = "$PSScriptRoot\..\config",
 
-    # New launcher if you have MSBuild tools installed
+    # Using this option will skip all downloads, if you only need to build launcher
+    [switch]$noVendor,
+
+    # Build launcher if you have MSBuild tools installed
     [switch]$Compile
 )
 
 # Get the scripts and cmder root dirs we are building in.
-$ScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
-$cmder_root = $ScriptRoot.replace("\scripts","")
+$cmder_root = Resolve-Path "$PSScriptRoot\.."
 
 # Dot source util functions into this scope
 . "$PSScriptRoot\utils.ps1"
 $ErrorActionPreference = "Stop"
 
-Push-Location -Path $saveTo
-$sources = Get-Content $sourcesPath | Out-String | Convertfrom-Json
+if ($Compile) {
+    # Check for requirements
+    Ensure-Executable "msbuild"
 
-# Get the version string
-$version = Get-VersionStr
+    # Get the version string
+    $version = Get-VersionStr
 
-# Check for requirements
-Ensure-Exists $sourcesPath
-Ensure-Executable "7z"
-New-Item -Type Directory -Path (Join-Path $saveTo "/tmp/") -ErrorAction SilentlyContinue >$null
+    Push-Location -Path $launcher
+    Create-RC $version ($launcher + '\src\version.rc2')
 
-# Preserve modified (by user) ConEmu setting file
-if ($config -ne "") {
+    Write-Verbose "Building the launcher..."
+
+    # Referene: https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+    msbuild CmderLauncher.vcxproj /t:Clean,Build /p:configuration=Release /m
+
+    if ($LastExitCode -ne 0) {
+        throw "MSBuild failed to build the launcher executable."
+    }
+    Pop-Location
+}
+
+if (-Not $noVendor) {
+    # Check for requirements
+    Ensure-Exists $sourcesPath
+    Ensure-Executable "7z"
+
+    # Get the vendor sources
+    $sources = Get-Content $sourcesPath | Out-String | ConvertFrom-Json
+
+    Push-Location -Path $saveTo
+    New-Item -Type Directory -Path (Join-Path $saveTo "/tmp/") -ErrorAction SilentlyContinue >$null
+
+    $vend = $pwd
+
+    # Preserve modified (by user) ConEmu setting file
+    if ($config -ne "") {
         $ConEmuXml = Join-Path $saveTo "conemu-maximus5\ConEmu.xml"
         if (Test-Path $ConEmuXml -pathType leaf) {
             $ConEmuXmlSave = Join-Path $config "ConEmu.xml"
             Write-Verbose "Backup '$ConEmuXml' to '$ConEmuXmlSave'"
             Copy-Item $ConEmuXml $ConEmuXmlSave
         } else { $ConEmuXml = "" }
-} else { $ConEmuXml = "" }
+    } else { $ConEmuXml = "" }
 
-# Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
-foreach ($ssh_agent in $(get-process ssh-agent -erroraction silentlycontinue)) {
-  if ([string]$($ssh_agent.path) -match [string]$cmder_root.replace('\','\\')) {
-    write-verbose $("Stopping " + $ssh_agent.path + "!")
-    stop-process $ssh_agent.id
+    # Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
+    foreach ($ssh_agent in $(Get-Process ssh-agent -ErrorAction SilentlyContinue)) {
+        if ([string]$($ssh_agent.path) -Match [string]$cmder_root.replace('\','\\')) {
+            Write-Verbose $("Stopping " + $ssh_agent.path + "!")
+            Stop-Process $ssh_agent.id
+        }
     }
-}
 
-$vend = $pwd
-foreach ($s in $sources) {
-    Write-Verbose "Getting $($s.name) from URL $($s.url)"
+    foreach ($s in $sources) {
+        Write-Verbose "Getting vendored $($s.name) $($s.version)..."
 
         # We do not care about the extensions/type of archive
         $tempArchive = "tmp/$($s.name).tmp"
@@ -102,51 +130,50 @@ foreach ($s in $sources) {
         Download-File -Url $s.url -File $vend\$tempArchive -ErrorAction Stop
         Extract-Archive $tempArchive $s.name
 
-    if ((Get-Childitem $s.name).Count -eq 1) {
+        if ((Get-ChildItem $s.name).Count -eq 1) {
             Flatten-Directory($s.name)
         }
+
         # Write current version to .cmderver file, for later.
         "$($s.version)" | Out-File "$($s.name)/.cmderver"
-}
+    }
 
-# Restore user configuration
-if ($ConEmuXml -ne "") {
+    # Restore ConEmu user configuration
+    if ($ConEmuXml -ne "") {
         Write-Verbose "Restore '$ConEmuXmlSave' to '$ConEmuXml'"
         Copy-Item $ConEmuXmlSave $ConEmuXml
-}
+    }
 
-Pop-Location
+    # Put vendor\cmder.sh in /etc/profile.d so it runs when we start bash or mintty
+    if ( (Test-Path $($saveTo + "git-for-windows/etc/profile.d") ) ) {
+        Write-Verbose "Adding cmder.sh /etc/profile.d"
+        Copy-Item $($saveTo + "cmder.sh") $($saveTo + "git-for-windows/etc/profile.d/cmder.sh")
+    }
 
-if($Compile) {
-    Push-Location -Path $launcher
-    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
-        }
+    # Replace /etc/profile.d/git-prompt.sh with cmder lambda prompt so it runs when we start bash or mintty
+    if ( !(Test-Path $($saveTo + "git-for-windows/etc/profile.d/git-prompt.sh.bak") ) ) {
+        Write-Verbose "Replacing /etc/profile.d/git-prompt.sh with our git-prompt.sh"
+        Move-Item $($saveTo + "git-for-windows/etc/profile.d/git-prompt.sh") $($saveTo + "git-for-windows/etc/profile.d/git-prompt.sh.bak")
+        Copy-Item $($saveTo + "git-prompt.sh") $($saveTo + "git-for-windows/etc/profile.d/git-prompt.sh")
     }
+
     Pop-Location
-} else {
-    Write-Warning "You are not building a launcher, Use -Compile"
+}
+
+if (-Not $Compile -Or $noVendor) {
+    Write-Warning "You are not building the full project, Use -Compile without -noVendor"
     Write-Warning "This cannot be a release. Test build only!"
+    return
 }
 
-# Put vendor\cmder.sh in /etc/profile.d so it runs when we start bash or mintty
-if ( (Test-Path $($SaveTo + "git-for-windows/etc/profile.d") ) ) {
-  write-verbose "Adding cmder.sh /etc/profile.d"
-  Copy-Item $($SaveTo + "cmder.sh") $($SaveTo + "git-for-windows/etc/profile.d/cmder.sh")
+Write-Verbose "Successfully built Cmder v$version!"
+
+if ( $Env:APPVEYOR -eq 'True' ) {
+    Add-AppveyorMessage -Message "Building Cmder v$version was successful." -Category Information
 }
 
-# Replace /etc/profile.d/git-prompt.sh with cmder lambda prompt so it runs when we start bash or mintty
-if ( !(Test-Path $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh.bak") ) ) {
-  write-verbose "Replacing /etc/profile.d/git-prompt.sh with our git-prompt.sh"
-  Move-Item $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh") $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh.bak")
-  Copy-Item $($SaveTo + "git-prompt.sh") $($SaveTo + "git-for-windows/etc/profile.d/git-prompt.sh")
+if ( $Env:GITHUB_ACTIONS -eq 'true' ) {
+    Write-Output "::notice title=Build Complete::Building Cmder v$version was successful."
 }
 
-Write-Verbose "All good and done!"
+Write-Host -ForegroundColor green "All good and done!"

scripts/pack.ps1

@@ -1,6 +1,6 @@
 <#
 .Synopsis
-    Pack cmder
+    Pack Cmder
 .DESCRIPTION
     Use this script to pack cmder into release archives
 
@@ -11,7 +11,7 @@
 
     Creates default archives for cmder
 .EXAMPLE
-    .\build -verbose
+    .\pack.ps1 -verbose
 
     Creates default archives for cmder with plenty of information
 .NOTES
@@ -29,30 +29,48 @@ Param(
     # -whatif switch to not actually make changes
 
     # Path to the vendor configuration source file
-    [string]$cmderRoot = "..",
+    [string]$cmderRoot = "$PSScriptRoot\..",
 
     # Vendor folder locaton
-    [string]$saveTo = "..\build"
+    [string]$saveTo = "$PSScriptRoot\..\build"
 )
 
+$cmderRoot = Resolve-Path $cmderRoot
+
 . "$PSScriptRoot\utils.ps1"
 $ErrorActionPreference = "Stop"
 Ensure-Executable "7z"
 
 $targets = @{
     "cmder.zip" = $null;
-    "cmder.7z" = $null;
-    "cmder_mini.zip" = "-x!`"vendor\git-for-windows`"";
+    "cmder.7z" = "-t7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on";
+    "cmder_mini.zip" = "-mm=Deflate -mfb=258 -mpass=15 -xr!`"vendor\git-for-windows`"";
 }
 
-Delete-Existing "..\Version*"
-Delete-Existing "..\build\*"
+Push-Location -Path $cmderRoot
+
+Delete-Existing "$cmderRoot\Version*"
+Delete-Existing "$cmderRoot\build\*"
+
+if (-not (Test-Path -PathType container $saveTo)) {
+    (New-Item -ItemType Directory -Path $saveTo) | Out-Null
+}
+
+$saveTo = Resolve-Path $saveTo
 
 $version = Get-VersionStr
 (New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null
 
+if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
+    Write-Verbose "Packing Cmder $version in $saveTo..."
+    $excluded = (Get-Content -Path "$cmderRoot\packignore") -Split [System.Environment]::NewLine | Where-Object {$_}
+    Get-ChildItem $cmderRoot -Force -Exclude $excluded
+}
+
 foreach ($t in $targets.GetEnumerator()) {
-    Create-Archive $cmderRoot "$saveTo\$($t.Name)" $t.Value
+    Create-Archive "$cmderRoot" "$saveTo\$($t.Name)" $t.Value
     $hash = (Digest-Hash "$saveTo\$($t.Name)")
     Add-Content -path "$saveTo\hashes.txt" -value ($t.Name + ' ' + $hash)
 }
+
+Pop-Location

scripts/update.ps1

@@ -0,0 +1,266 @@
+<#
+.Synopsis
+    Update Cmder vendored dependencies
+.DESCRIPTION
+    This script updates dependencies to the latest version in vendor/sources.json file.
+
+    You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
+    Then unblock the script for execution with UnblockFile .\build.ps1
+.EXAMPLE
+    .\build.ps1
+
+    Updates the dependency sources in the default location, the vendor/sources.json file.
+.EXAMPLE
+    .\build -verbose
+
+    Updates the dependency sources and see what's going on.
+.EXAMPLE
+    .\build.ps1 -SourcesPath '~/custom/vendors.json'
+
+    Specify the path to update dependency sources file at.
+.NOTES
+    AUTHORS
+    David Refoua <David@Refoua.me>
+    Part of the Cmder project.
+.LINK
+    http://cmder.app/ - Project Home
+#>
+[CmdletBinding(SupportsShouldProcess=$true)]
+Param(
+    # CmdletBinding will give us;
+    # -verbose switch to turn on logging and
+    # -whatif switch to not actually make changes
+
+    # Path to the vendor configuration source file
+    [string]$sourcesPath = "$PSScriptRoot\..\vendor\sources.json"
+)
+
+# Get the root directory of the cmder project.
+$cmder_root = Resolve-Path "$PSScriptRoot\.."
+
+# Dot source util functions into this scope
+. "$PSScriptRoot\utils.ps1"
+$ErrorActionPreference = "Stop"
+
+# Attempts to match the current link with the new link, returning the count of matching characters.
+function Match-Filenames {
+    param (
+        $url,
+        $downloadUrl,
+        $fromEnd
+    )
+
+    $filename = [System.IO.Path]::GetFileName($url)
+    $filenameDownload = [System.IO.Path]::GetFileName($downloadUrl)
+
+    $position = 0
+
+    if ([String]::IsNullOrEmpty($filename) -Or [String]::IsNullOrEmpty($filenameDownload)) {
+        throw "Either one or both filenames are empty!"
+    }
+
+    if ($fromEnd) {
+        $arr = $filename -split ""
+        [array]::Reverse($arr)
+        $filename = $arr -join ''
+        $arr = $filenameDownload -split ""
+        [array]::Reverse($arr)
+        $filenameDownload = $arr -join ''
+    }
+
+    while ($filename.Substring($position, 1) -eq $filenameDownload.Substring($position, 1)) {
+        $position++
+
+        if ( ($position -ge $filename.Length) -or ($position -ge $filenameDownload.Length) ) {
+            break
+        }
+    }
+
+    return $position
+}
+
+# Uses the GitHub api in order to fetch the current download links for the latest releases of the repo.
+function Fetch-DownloadUrl {
+    param (
+        [Parameter(Mandatory = $true)]
+        $urlStr
+    )
+
+    $url = [uri] $urlStr
+
+    if ((-Not $url) -Or ($null -eq $url) -Or ($url -eq '')) {
+        throw "Failed to parse url: $urlStr"
+    }
+
+    if (-Not ("http", "https" -Contains $url.Scheme)) {
+        throw "unknown source scheme: $($url.Scheme)"
+    }
+
+    if (-Not ($url.Host -ilike "*github.com")) {
+        throw "unknown source domain: $($url.Host)"
+    }
+
+    $p = $url.Segments.Split([Environment]::NewLine)
+
+    # Api server for GitHub
+    $urlHost = "api.github.com"
+
+    # Path for releases end-point
+    $urlPath = [IO.Path]::Combine('repos', $p[1], $p[2], 'releases').Trim('/')
+
+    $apiUrl = [uri] (New-Object System.UriBuilder -ArgumentList $url.Scheme, $urlHost, -1, $urlPath).Uri
+
+    $info = Invoke-RestMethod -Uri $apiUrl
+
+    $downloadLinks = (New-Object System.Collections.Generic.List[System.Object])
+
+    $charCount = 0
+
+    if (-Not ($info -Is [array])) {
+        throw "The response received from API server is invalid"
+    }
+
+    :loop foreach ($i in $info) {
+        if (-Not ($i.assets -Is [array])) {
+            continue
+        }
+
+        foreach ($a in $i.assets) {
+            if ([String]::IsNullOrEmpty($a.browser_download_url)) {
+                continue
+            }
+
+			# Skip some download links as we're not interested in them
+            if ( $a.browser_download_url -ilike "*_symbols*" ) {
+                continue
+            }
+
+            $score = Match-Filenames $url $a.browser_download_url
+
+			# Skip links that don't match or are less similar
+            if ( ($score -eq 0) -or ($score -lt $charCount) ) {
+                continue
+            }
+
+			# If we reach the same download link as we have
+            if ( $score -eq [System.IO.Path]::GetFileName($url).Length ) {
+            }
+
+            $charCount = $score
+            $downloadLinks.Add($a.browser_download_url)
+        }
+
+		# If at least one download link was found, don't continue with older releases
+        if ( $downloadLinks.Length -gt 0 ) {
+            break :loop
+        }
+    }
+
+	# Special case for archive downloads of repository
+    if (($null -eq $downloadLinks) -Or (-Not $downloadLinks)) {
+        if ((($p | % {$_.Trim('/')}) -Contains "archive") -And $info[0].tag_name) {
+            for ($i = 0; $i -lt $p.Length; $i++) {
+                if ($p[$i].Trim('/') -eq "archive") {
+                    $p[$i+1] = $info[0].tag_name + ".zip"
+                    $downloadLinks = $url.Scheme + "://" + $url.Host + ($p -Join '')
+                    return $downloadLinks
+                }
+            }
+        }
+        return ''
+    }
+
+    $temp = $downloadLinks | Where-Object { (Match-Filenames $url $_) -eq $charCount }
+
+    $downloadLinks = (New-Object System.Collections.Generic.List[System.Object])
+
+    $charCount = 0
+
+    foreach ($l in $temp) {
+        $score = Match-Filenames $url $l true
+
+        if ( ($score -eq 0) -or ($score -lt $charCount) ) {
+            continue
+        }
+
+        $charCount = $score
+    }
+
+    $downloadLinks = $temp | Where-Object { (Match-Filenames $url $_ true) -eq $charCount }
+
+    if (($null -eq $downloadLinks) -Or (-Not $downloadLinks)) {
+        throw "No suitable download links matched for the url!"
+    }
+
+    if (-Not($downloadLinks -is [String])) {
+        throw "Found multiple matches for the same url:`n" + $downloadLinks
+    }
+
+    return $downloadLinks
+}
+
+$count = 0
+
+# Read the current sources content
+$sources = Get-Content $sourcesPath | Out-String | ConvertFrom-Json
+
+foreach ($s in $sources) {
+    Write-Verbose "Updating sources link for $($s.name)..."
+
+	Write-Verbose "Old Link: $($s.url)"
+
+    $downloadUrl = Fetch-DownloadUrl $s.url
+
+    if (($null -eq $downloadUrl) -Or ($downloadUrl -eq '')) {
+        Write-Verbose "No new links were found"
+        continue
+    }
+
+    Write-Verbose "Link: $downloadUrl"
+
+    $url = [uri] $downloadUrl
+
+    $version = ''
+
+    if ( ($url.Segments[-3] -eq "download/") -And ($url.Segments[-2].StartsWith("v")) ) {
+        $version = $url.Segments[-2].TrimStart('v').TrimEnd('/')
+    }
+
+    if ( ($url.Segments[-2] -eq "archive/") ) {
+        $version = [System.IO.Path]::GetFileNameWithoutExtension($url.Segments[-1].TrimStart('v').TrimEnd('/'))
+    }
+
+    if ( $version -eq '' ) {
+        throw "Unable to extract version from url string"
+    }
+
+    Write-Verbose "Version: $version"
+
+	if ( $s.version -ne $version ) {
+		# if ( ([System.Version] $s.version) -gt ([System.Version] $version) ) {
+		# 	throw "The current version $($s.version) is already newer than the found version $version!"
+		# }
+
+		$count++
+	}
+
+    $s.url = $downloadUrl
+    $s.version = $version
+}
+
+$sources | ConvertTo-Json | Set-Content $sourcesPath
+
+if ($count -eq 0) {
+	Write-Host -ForegroundColor yellow "No new releases were found."
+	return
+}
+
+if ( $Env:APPVEYOR -eq 'True' ) {
+    Add-AppveyorMessage -Message "Successfully updated $count dependencies." -Category Information
+}
+
+if ( $Env:GITHUB_ACTIONS -eq 'true' ) {
+    Write-Output "::notice title=Task Complete::Successfully updated $count dependencies."
+}
+
+Write-Host -ForegroundColor green "Successfully updated $count dependencies."

scripts/utils.ps1

@@ -9,13 +9,13 @@ function Ensure-Exists($path) {
 function Ensure-Executable($command) {
     try { Get-Command $command -ErrorAction Stop > $null }
     catch {
-        If( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){
-            set-alias -Name "7z" -Value "$env:programfiles\7-zip\7z.exe" -Scope script
+        if( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){
+            Set-Alias -Name "7z" -Value "$env:programfiles\7-zip\7z.exe" -Scope script
         }
-        ElseIf( ($command -eq "7z") -and (Test-Path "$env:programw6432\7-zip\7z.exe") ) {
-            set-alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script
+        elseif( ($command -eq "7z") -and (Test-Path "$env:programw6432\7-zip\7z.exe") ) {
+            Set-Alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script
         }
-        Else {
+        else {
             Write-Error "Missing $command! Ensure it is installed and on in the PATH"
             exit 1
         }
@@ -23,85 +23,109 @@ function Ensure-Executable($command) {
 }
 
 function Delete-Existing($path) {
-    Write-Verbose "Remove $path"
-    Remove-Item -Recurse -force $path -ErrorAction SilentlyContinue
+    if (Test-Path $path) {
+        Write-Verbose "Remove existing $path"
+    }
+    Remove-Item -Recurse -Force $path -ErrorAction SilentlyContinue
 }
 
 function Extract-Archive($source, $target) {
     Write-Verbose $("Extracting Archive '$cmder_root\vendor\" + $source.replace('/','\') + " to '$cmder_root\vendor\$target'")
     Invoke-Expression "7z x -y -o`"$($target)`" `"$source`"  > `$null"
     if ($lastexitcode -ne 0) {
-        Write-Error "Extracting of $source failied"
+        Write-Error "Extracting of $source failed"
     }
     Remove-Item $source
 }
 
 function Create-Archive($source, $target, $params) {
-    $command = "7z a -x@`"$source\packignore`" $params $target $source  > `$null"
-    Write-Verbose "Running: $command"
+    $command = "7z a -xr@`"$source\packignore`" $params `"$target`" `"$source\*`"  > `$null"
+    Write-Verbose "Creating Archive from '$source' in '$target' with parameters '$params'"
     Invoke-Expression $command
     if ($lastexitcode -ne 0) {
-        Write-Error "Compressing $source failied"
+        Write-Error "Compressing $source failed"
     }
 }
 
 # If directory contains only one child directory
 # Flatten it instead
 function Flatten-Directory($name) {
-    $child = (Get-Childitem $name)[0]
-    Rename-Item $name -NewName "$($name)_moving"
-    Move-Item -Path "$($name)_moving\$child" -Destination $name
-    Remove-Item -Recurse "$($name)_moving"
+    $name = Resolve-Path $name
+    $moving = "$($name)_moving"
+    Rename-Item $name -NewName $moving
+    Write-Verbose "Flattening the '$name' directory..."
+    $child = (Get-Childitem $moving)[0] | Resolve-Path
+    Move-Item -Path $child -Destination $name
+    Remove-Item -Recurse $moving
 }
 
 function Digest-Hash($path) {
-    if(Get-Command Get-FileHash -ErrorAction SilentlyContinue){
+    if (Get-Command Get-FileHash -ErrorAction SilentlyContinue) {
         return (Get-FileHash -Algorithm SHA256 -Path $path).Hash
     }
 
     return Invoke-Expression "md5sum $path"
 }
 
-function Get-VersionStr() {
+function Set-GHVariable {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Name,
+        [Parameter(Mandatory = $true)]
+        [string]$Value
+    )
 
+    Write-Verbose "Setting CI variable $Name to $Value" -Verbose
+
+    if ($env:GITHUB_ENV) {
+        echo "$Name=$Value" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+    }
+}
+
+function Get-GHTempPath {
+    $temp = [System.IO.Path]::GetTempPath()
+    if ($env:RUNNER_TEMP) {
+        $temp = $env:RUNNER_TEMP
+    }
+
+    Write-Verbose "Get CI Temp path: $temp" -Verbose
+    return $temp
+}
+
+function Get-VersionStr {
     # Clear existing variable
     if ($string) { Clear-Variable -name string }
 
     # Determine if git is available
-    if (Get-Command "git.exe" -ErrorAction SilentlyContinue)
-    {
-
+    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' )
-        {
+        if ( $GitPresent -eq 'true' ) {
             $string = Invoke-Expression "git describe --abbrev=0 --tags"
         }
-
     }
 
     # Fallback used when Git is not available
-    if ( -not($string) )
-    {
+    if ( -not($string) ) {
         $string = Parse-Changelog ($PSScriptRoot + '\..\' + 'CHANGELOG.md')
     }
 
     # Add build number, if AppVeyor is present
-    if ( $Env:APPVEYOR -eq 'True' )
-    {
+    if ( $Env:APPVEYOR -eq 'True' ) {
         $string = $string + '.' + $Env:APPVEYOR_BUILD_NUMBER
     }
+    elseif ( $Env:GITHUB_ACTIONS -eq 'true' ) {
+        $string = $string + '.' + $Env:GITHUB_RUN_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()]+\)$';
 
@@ -112,7 +136,6 @@ function Parse-Changelog($file) {
 }
 
 function Create-RC($string, $path) {
-
     $version  = $string + '.0.0.0.0' # padding for version string
 
     if ( !(Test-Path "$path.sample") ) {
@@ -138,7 +161,6 @@ function Create-RC($string, $path) {
 
     # Write the results
     Set-Content -Path $path -Value $resource
-
 }
 
 function Register-Cmder() {
@@ -202,13 +224,26 @@ function Download-File {
     )
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-    # I think this is the problem
+    $useBitTransfer = $null -ne (Get-Module -Name BitsTransfer -ListAvailable) -and ($PSVersionTable.PSVersion.Major -le 5)
+
     $File = $File -Replace "/", "\"
-    Write-Verbose "Downloading from $Url to $File"
+
+    try {
+        if ($useBitTransfer) {
+            Start-BitsTransfer -Source $Url -Destination $File -DisplayName "Downloading $Url to $File"
+            Return
+        }
+    }
+    catch {
+        Write-Error "Failed to download file using BITS, reason: $_`nUsing fallback method instead...`n"
+    }
+
+    Write-Verbose "Downloading from $Url to $File`n"
+
     $wc = New-Object System.Net.WebClient
     if ($env:https_proxy) {
         $wc.proxy = (New-Object System.Net.WebProxy($env:https_proxy))
     }
-    $wc.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetworkCredentials;
+    $wc.Proxy.Credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials;
     $wc.DownloadFile($Url, $File)
 }

vendor/ConEmu.xml.default

@@ -549,14 +549,14 @@
 					<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;&quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i&quot;"/>
+					<value name="Cmd1" type="string" data="*&quot;%ConEmuDir%\..\git-for-windows\usr\bin\bash.exe&quot; --login -i"/>
 				</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;&quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i&quot;"/>
+					<value name="Cmd1" type="string" data="&quot;%ConEmuDir%\..\git-for-windows\usr\bin\bash.exe&quot; --login -i"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
 				</key>

vendor/bin/alias.cmd

@@ -91,7 +91,7 @@ if not ["%_temp%"] == ["%alias_name%"] (
 )
 
 :: replace already defined alias
-%WINDIR%\System32\findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /b /l /v /i "%alias_name%=" "%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 +99,8 @@ exit /b
 
 :p_del
 set del_alias=%~1
-%WINDIR%\System32\findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
+
+%WINDIR%\System32\findstr /b /l /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
 doskey /macrofile="%ALIASES%"
@@ -139,9 +140,9 @@ echo.         in he alias is desired. Variables in aliases surrounded by double
 echo.         quotes only require '^^%%' vs '^^^^^^^^%%'
 echo. $*    - allows the alias to assume all the parameters of the supplied
 echo.         command.
-echo. $1-$9 - Allows you to seperate parameter by number, much like %%1 in
+echo. $1-$9 - Allows you to separate parameter by number, much like %%1 in
 echo.         batch.
-echo. $T    - Command seperator, allowing you to string several commands
+echo. $T    - Command separator, allowing you to string several commands
 echo.         together into one alias.
 echo.
 echo. For more information, read DOSKEY /?

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" (
@@ -86,29 +84,29 @@ echo Usage:
 echo.
 echo cexec /setPath [NOT] flagName command/program [parameters]
 echo.
-echo   /setPath         Generate a global varibles %%ccall%% and  %%cexec%% for
+echo   /setPath         Generate a global variables %%ccall%% and  %%cexec%% for
 echo                    quicker use. Following arguments will be ignored.
 echo.
 echo   NOT              Specifies that cexec should carry out
 echo                    the command only if the flag is missing.
 echo.
-echo   /[flagName]      Specifies which flag name is to detect. It's recommand
+echo   /[flagName]      Specifies which flag name is to detect. It's recommended
 echo                    to use a pair of double quotation marks to wrap
 echo                    your flag name to avoid exceed expectation.
 echo.
 echo   command/program  Specifies the command to carry out if the
-echo                    argument name is detected. It's recommand to
+echo                    argument name is detected. It's recommended to
 echo                    use a pair of double quotation marks to
 echo                    wrap your command to avoid exceed expectation.
 echo.
 echo   parameters       These are the parameters passed to the command/program.
-echo                    It's recommand to use a pair of double quotation marks 
+echo                    It's recommended to use a pair of double quotation marks 
 echo                    to wrap your flag name to avoid exceed expectation.
 echo.
 echo Examples:
 echo.
 echo   These examples are expected to be written in %cmder_root%/config/user-profile.cmd
-echo   CExec evaluates the environment varible "CMDER_USER_FLAGS" and conditionally
+echo   CExec evaluates the environment variable "CMDER_USER_FLAGS" and conditionally
 echo   caries out actions based on flags that are passed.
 echo.
 echo   Case 1:

vendor/bin/cmder_diag.cmd

@@ -1,5 +1,29 @@
 @echo off
 
+(echo.
+echo ------------------------------------
+echo set
+echo ------------------------------------
+set
+
+echo.
+echo ------------------------------------
+echo where git
+echo ------------------------------------
+where git
+
+echo.
+echo ------------------------------------
+echo where clink
+echo ------------------------------------
+where clink
+
+echo.
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo
+
 echo ------------------------------------
 echo dir "%cmder_root%"
 echo ------------------------------------
@@ -23,19 +47,15 @@ echo dir /s "%cmder_root%\config"
 echo ------------------------------------
 dir /s "%cmder_root%\config"
 
-echo.
-echo ------------------------------------
-echo set
-echo ------------------------------------
-set
-
-echo.
-echo ------------------------------------
-echo where git
-echo ------------------------------------
-where git
-
 echo.
 echo ------------------------------------
 echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
 echo ------------------------------------
+) > "%temp%\cmder_diag_cmd.log"
+
+type "%temp%\cmder_diag_cmd.log"
+
+echo.
+echo Above output was saved in "%temp%\cmder_diag_cmd.log"
+
+

vendor/bin/cmder_diag.ps1

@@ -1,39 +1,64 @@
-write-host ------------------------------------
-write-host get-childitem "$env:CMDER_ROOT"
-write-host ------------------------------------
-get-childitem "$env:CMDER_ROOT"
+if (test-path  $env:temp\cmder_diag_ps.log) {
+  remove-item $env:temp\cmder_diag_ps.log
+}
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem "$env:CMDER_ROOT/vendor"
-write-host ------------------------------------
-get-childitem "$env:CMDER_ROOT/vendor"
+$cmder_diag = {
+""
+"------------------------------------"
+"get-childitem env:"
+"------------------------------------"
+get-childitem env: | ft -autosize -wrap 2>&1
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem -s "$env:CMDER_ROOT/bin"
-write-host ------------------------------------
-get-childitem -s "$env:CMDER_ROOT/bin"
+""
+"------------------------------------"
+"get-command git -all -ErrorAction SilentlyContinue"
+"------------------------------------"
+get-command git -all -ErrorAction SilentlyContinue
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem -s "$env:CMDER_ROOT/config"
-write-host ------------------------------------
-get-childitem -s "$env:CMDER_ROOT/config"
+""
+"------------------------------------"
+"get-command clink -all -ErrorAction SilentlyContinue"
+"------------------------------------"
+get-command clink -all -ErrorAction SilentlyContinue
 
-write-host ''
-write-host ------------------------------------
-write-host get-childitem env:
-write-host ------------------------------------
-get-childitem env: |ft -autosize -wrap
+""
+"------------------------------------"
+"systeminfo"
+"------------------------------------"
+systeminfo 2>&1
 
-write-host ''
-write-host ------------------------------------
-write-host get-command git
-write-host ------------------------------------
-get-command git
+"------------------------------------"
+"get-childitem '$env:CMDER_ROOT'"
+"------------------------------------"
+get-childitem "$env:CMDER_ROOT" |ft LastWriteTime,mode,length,FullName
 
-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!
-write-host ------------------------------------
+""
+"------------------------------------"
+"get-childitem '$env:CMDER_ROOT/vendor'"
+"------------------------------------"
+get-childitem "$env:CMDER_ROOT/vendor" |ft LastWriteTime,mode,length,FullName
+
+""
+"------------------------------------"
+"get-childitem -s '$env:CMDER_ROOT/bin'"
+"------------------------------------"
+get-childitem -s "$env:CMDER_ROOT/bin" |ft LastWriteTime,mode,length,FullName
+
+""
+"------------------------------------"
+"get-childitem -s '$env:CMDER_ROOT/config'"
+"------------------------------------"
+get-childitem -s "$env:CMDER_ROOT/config" |ft LastWriteTime,mode,length,FullName
+
+""
+"------------------------------------"
+"Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!"
+"------------------------------------"
+}
+
+& $cmder_diag | out-file -filePath $env:temp\cmder_diag_ps.log
+
+get-content "$env:temp\cmder_diag_ps.log"
+
+write-host ""
+write-host Above output was saved in "$env:temp\cmder_diag_ps.log"

vendor/bin/cmder_diag.sh

@@ -1,39 +1,61 @@
-echo ------------------------------------
-echo ls -la "$CMDER_ROOT"
-echo ------------------------------------
-ls -la "$CMDER_ROOT"
+#!/usr/bin/env bash
 
-echo ''
-echo ------------------------------------
-echo ls -la "$CMDER_ROOT/vendor"
-echo ------------------------------------
-ls -la "$CMDER_ROOT/vendor"
+[[ -f "$TEMP/cmder_diag_sh.log" ]] && rm -f  "$TEMP/cmder_diag_sh.log"
 
-echo ''
-echo ------------------------------------
-echo ls -la /s "$CMDER_ROOT/bin"
-echo ------------------------------------
-ls -laR /s "$CMDER_ROOT/bin"
-
-echo ''
-echo ------------------------------------
-echo ls -la /s "$CMDER_ROOT/config"
-echo ------------------------------------
-ls -laR /s "$CMDER_ROOT/config"
-
-echo ''
+(echo ''
 echo ------------------------------------
 echo env
 echo ------------------------------------
-env
+env 2>&1
 
 echo ''
 echo ------------------------------------
 echo which git
 echo ------------------------------------
-which git
+which git 2>&1
+
+echo ''
+echo ------------------------------------
+echo which clink
+echo ------------------------------------
+which clink 2>&1
+
+echo ''
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo 2>&1
+
+echo ------------------------------------
+echo ls -la "$CMDER_ROOT"
+echo ------------------------------------
+ls -la "$CMDER_ROOT" 2>&1
+
+echo ''
+echo ------------------------------------
+echo ls -la "$CMDER_ROOT/vendor"
+echo ------------------------------------
+ls -la "$CMDER_ROOT/vendor" 2>&1
+
+echo ''
+echo ------------------------------------
+echo ls -la /s "$CMDER_ROOT/bin"
+echo ------------------------------------
+ls -laR /s "$CMDER_ROOT/bin" 2>&1
+
+echo ''
+echo ------------------------------------
+echo ls -la /s "$CMDER_ROOT/config"
+echo ------------------------------------
+ls -laR /s "$CMDER_ROOT/config" 2>&1
 
 echo ''
 echo ------------------------------------
 echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
 echo ------------------------------------
+) > "$TEMP/cmder_diag_sh.log"
+
+cat "$TEMP/cmder_diag_sh.log"
+
+echo ''
+echo Above output was saved in "$TEMP/cmder_diag_sh.log"

vendor/bin/cmder_shell.cmd

@@ -0,0 +1,13 @@
+@echo off
+
+set CMDER_ROOT=%~dp0..\
+
+if "%cmder_init%" == "1" (
+  "%CMDER_ROOT%\vendor\clink\clink.bat" inject -q --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
+) else (
+  set cmder_init=1
+)
+
+pushd %CMDER_ROOT%
+call "%CMDER_ROOT%\vendor\init.bat" /f
+popd

vendor/bin/vscode_init.cmd

@@ -1,4 +1,26 @@
 @echo off
+
+rem 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"

vendor/bin/vscode_init_args.cmd.default

@@ -0,0 +1,58 @@
+@echo off
+
+rem Below are the default Cmder session settings:
+rem
+rem See "%CMDER_ROOT%\README.md" for details on these settings.
+rem
+rem `Cmder.exe` Arguments:
+rem ----------------------
+rem 
+rem `/c [cmder_user_cfg_root]
+rem set cmder_user_bin=[cmder_user_cfg_root]\bin
+rem set cmder_user_config=[cmder_user_cfg_root]\config
+rem
+rem `init.bat` Arguments
+rem --------------------
+rem
+rem `/d`
+rem debug_output=0
+rem
+rem `/v`
+rem verbose_output=0
+rem
+rem `/f`
+rem fast_init=0
+rem
+rem `/nix_tools`
+rem nix_tools=1
+rem
+rem `/t`
+rem time_init=0
+rem
+rem `/max_depth`
+rem max_depth=1
+rem
+rem `/user_aliases`
+rem user_aliases=
+rem
+rem `/git_install_root`
+rem GIT_INSTALL_ROOT=
+rem
+rem `/home`
+rem HOME=
+rem
+rem `/svn_ssh`
+rem SVN_SSH=
+
+echo Applying Cmder VSCode settings from '%~0'...
+
+if defined CMDER_CONFIGURED (
+    rem Set Cmder settings here for when VSCode is launched inside Cmder.
+    set verbose_output=1
+) else (
+    rem Set Cmder settings here for when VSCode is launched from outside Cmder.
+    set verbose_output=1
+)
+
+rem Set all required Cmder VSCode terminal environment settings above this line.
+echo Applying Cmder VSCode settings is complete!

vendor/clink.lua

@@ -13,6 +13,38 @@ dofile(clink_lua_file)
 
 -- now add our own things...
 
+
+local function get_uah_color()
+  return uah_color or "\x1b[1;33;49m" -- Green = uah = [user]@[hostname]
+end
+
+local function get_cwd_color()
+  return cwd_color or "\x1b[1;32;49m" -- Yellow cwd = Current Working Directory
+end
+
+local function get_lamb_color()
+  return lamb_color or "\x1b[1;30;49m" -- Light Grey = Lambda Color
+end
+
+
+local function get_clean_color()
+  return clean_color or "\x1b[1;37;49m"
+end
+
+
+local function get_dirty_color()
+  return dirty_color or "\x1b[33;3m"
+end
+
+
+local function get_conflict_color()
+  return conflict_color or "\x1b[31;1m"
+end
+
+local function get_unknown_color()
+  return unknown_color or "\x1b[37;1m"
+end
+
 ---
 -- Makes a string safe to use as the replacement in string.gsub
 ---
@@ -21,6 +53,42 @@ local function verbatim(s)
     return s
 end
 
+-- Extracts only the folder name from the input Path
+-- Ex: Input C:\Windows\System32 returns System32
+---
+local function get_folder_name(path)
+  local reversePath = string.reverse(path)
+  local slashIndex = string.find(reversePath, "\\")
+  return string.sub(path, string.len(path) - slashIndex + 2)
+end
+
+
+---
+-- Forward/backward compatibility for Clink asynchronous prompt filtering.
+-- With Clink v1.2.10 and higher this lets git status run in the background and
+-- refresh the prompt when it finishes, to eliminate waits in large git repos.
+---
+local io_popenyield
+local clink_promptcoroutine
+local cached_info = {}
+if clink.promptcoroutine and io.popenyield then
+    io_popenyield = io.popenyield
+    clink_promptcoroutine = clink.promptcoroutine
+else
+    io_popenyield = io.popen
+    clink_promptcoroutine = function (func)
+        return func(false)
+    end
+end
+
+
+---
+-- Global variable so other Lua scripts can detect whether they're in a Cmder
+-- shell session.
+---
+CMDER_SESSION = true
+
+
 ---
 -- Setting the prompt in clink means that commands which rewrite the prompt do
 -- not destroy our own prompt. It also means that started cmds (or batch files
@@ -44,17 +112,67 @@ local function set_prompt_filter()
     -- also check for square brackets
     if env == nil then env = old_prompt:match('.*%[([^%]]+)%].+:') end
 
-    -- build our own prompt
-    -- orig: $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m
-    -- color codes: "\x1b[1;37;40m"
-    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg}{svn} \n\x1b[1;39;40m{lamb} \x1b[0m"
-    local lambda = "λ"
-    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", verbatim(cwd))
-
-    if env ~= nil then
-        lambda = "("..env..") "..lambda
+    -- Much of the below was 'borrowed' from https://github.com/AmrEldib/cmder-powerline-prompt
+    -- Symbol displayed for the home dir in the prompt.
+    if not prompt_homeSymbol then
+      prompt_homeSymbol = "~"
     end
-    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", verbatim(lambda))
+
+    -- Symbol displayed in the new line below the prompt.
+    if not prompt_lambSymbol then
+      prompt_lambSymbol = "λ"
+    end
+
+    if not prompt_type then
+      prompt_type = "full"
+    end
+
+    if prompt_useHomeSymbol == nil then
+      prompt_useHomeSymbol = false
+    end
+
+    if prompt_useUserAtHost == nil then
+      prompt_useUserAtHost = false
+    end
+
+    if prompt_singleLine == nil then
+      prompt_singleLine = false
+    end
+
+    if prompt_includeVersionControl == nil then
+      prompt_includeVersionControl = true
+    end
+
+    if prompt_type == 'folder' then
+        cwd = get_folder_name(cwd)
+    end
+
+    if prompt_useHomeSymbol and string.find(cwd, clink.get_env("HOME")) then
+        cwd = string.gsub(cwd, clink.get_env("HOME"), prompt_homeSymbol)
+    end
+
+    uah = ''
+    if prompt_useUserAtHost then
+        uah = clink.get_env("USERNAME") .. "@" .. clink.get_env("COMPUTERNAME") .. ' '
+    end
+
+    cr = "\n"
+    if prompt_singleLine then
+      cr = ' '
+    end
+
+    if env ~= nil then env = "("..env..") " else env = "" end
+
+    if uah ~= '' then uah = get_uah_color() .. uah end
+    if cwd ~= '' then cwd = get_cwd_color() .. cwd end
+
+    local version_control = prompt_includeVersionControl and "{git}{hg}{svn}" or ""
+
+    prompt = "{uah}{cwd}" .. version_control .. get_lamb_color() .. cr .. "{env}{lamb} \x1b[0m"
+    prompt = string.gsub(prompt, "{uah}", uah)
+    prompt = string.gsub(prompt, "{cwd}", cwd)
+    prompt = string.gsub(prompt, "{env}", env)
+    clink.prompt.value = string.gsub(prompt, "{lamb}", prompt_lambSymbol)
 end
 
 local function percent_prompt_filter()
@@ -138,6 +256,12 @@ local function get_git_dir(path)
         local git_dir = gitfile:read():match('gitdir: (.*)')
         gitfile:close()
 
+        if os.isdir then -- only available in Clink v1.0.0 and higher
+            if git_dir and os.isdir(git_dir) then
+                return git_dir
+            end
+        end
+
         return git_dir and dir..'/'..git_dir
     end
 
@@ -185,11 +309,18 @@ local function get_git_branch(git_dir)
 end
 
 ---
--- Find out current branch
--- @return {false|mercurial branch name}
+-- Find out current branch information
+-- @return {false|mercurial branch information}
 ---
 local function get_hg_branch()
-    local file = io.popen("hg branch 2>nul")
+    -- Return the branch information. The default is to get just the
+    -- branch name, but you could e.g. use the "hg-prompt" extension to
+    -- get more information, such as any applied mq patches. Here's an
+    -- example of that:
+    -- local cmd = "hg prompt \"{branch}{status}{|{patch}}{update}\""
+    local cmd = "hg branch 2>nul"
+    local file = io.popen(cmd)
+
     for line in file:lines() do
         local m = line:match("(.+)$")
         if m then
@@ -207,7 +338,7 @@ end
 -- @return {false|svn branch name}
 ---
 local function get_svn_branch(svn_dir)
-    local file = io.popen("svn info 2>nul")
+    local file = io_popenyield("svn info 2>nul")
     for line in file:lines() do
         local m = line:match("^Relative URL:")
         if m then
@@ -221,32 +352,27 @@ local function get_svn_branch(svn_dir)
 end
 
 ---
--- Get the status of working dir
--- @return {bool}
+-- Get the status and conflict status of working dir
+-- @return {bool <status>, bool <is_conflict>}
 ---
 local function get_git_status()
-    local file = io.popen("git --no-optional-locks status --porcelain 2>nul")
+    local file = io_popenyield("git --no-optional-locks status --porcelain 2>nul")
+    local conflict_found = false
+    local is_status = true
     for line in file:lines() do
-        file:close()
-        return false
+        local code = line:sub(1, 2)
+        -- print (string.format("code: %s, line: %s", code, line))
+        if code == "DD" or code == "AU" or code == "UD" or code == "UA" or code == "DU" or code == "AA" or code == "UU" then
+          is_status = false
+          conflict_found = true
+          break
+        -- unversioned files are ignored, comment out 'code ~= "!!"' to unignore them
+        elseif code ~= "!!" and code ~= "??" then
+          is_status = false
+        end
     end
     file:close()
-
-    return true
-end
-
----
--- Gets the conflict status
--- @return {bool} indicating true for conflict, false for no conflicts
----
-function get_git_conflict()
-    local file = io.popen("git diff --name-only --diff-filter=U 2>nul")
-    for line in file:lines() do
-        file:close()
-        return true;
-    end
-    file:close()
-    return false
+    return { status = is_status, conflict = conflict_found }
 end
 
 
@@ -270,7 +396,7 @@ end
 -- @return {bool}
 ---
 local function get_svn_status()
-    local file = io.popen("svn status -q")
+    local file = io_popenyield("svn status -q")
     for line in file:lines() do
         file:close()
         return false
@@ -280,57 +406,109 @@ local function get_svn_status()
     return true
 end
 
+---
+-- Use a prompt coroutine to get git status in the background.
+-- Cache the info so we can reuse it next time to reduce flicker.
+---
+local function get_git_info_table()
+    local info = clink_promptcoroutine(function ()
+        return get_git_status()
+    end)
+    if not info then
+        info = cached_info.git_info or {}
+    else
+        cached_info.git_info = info
+    end
+    return info
+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")
+    -- When async prompt filtering is available, check the
+    -- prompt_overrideGitStatusOptIn config setting for whether to ignore the
+    -- cmder.status and cmder.cmdstatus git config opt-in settings.
+    if clink.promptcoroutine and io.popenyield and settings.get("prompt.async") then
+        if prompt_overrideGitStatusOptIn then
+            return true
+        end
+    end
 
-    for line in gitStatusSetting:lines() do
-        if string.match(line, 'cmder.status=false') or string.match(line, 'cmder.cmdstatus=false') then
-          gitStatusSetting:close()
+    local gitStatusConfig = io.popen("git --no-pager config cmder.status 2>nul")
+
+    for line in gitStatusConfig:lines() do
+        if string.match(line, 'false') then
+          gitStatusConfig:close()
           return false
         end
     end
-    gitStatusSetting:close()
+
+    local gitCmdStatusConfig = io.popen("git --no-pager config cmder.cmdstatus 2>nul")
+    for line in gitCmdStatusConfig:lines() do
+        if string.match(line, 'false') then
+          gitCmdStatusConfig:close()
+          return false
+        end
+    end
+    gitStatusConfig:close()
+    gitCmdStatusConfig:close()
 
     return true
 end
 
 local function git_prompt_filter()
 
+    -- Don't do any git processing if the prompt doesn't want to show git info.
+    if not clink.prompt.value:find("{git}") then
+        return false
+    end
+
     -- Colors for git status
     local colors = {
-        clean = "\x1b[1;37;40m",
-        dirty = "\x1b[33;3m",
-        conflict = "\x1b[31;1m"
+        clean = get_clean_color(),
+        dirty = get_dirty_color(),
+        conflict = get_conflict_color(),
+        nostatus = get_unknown_color()
     }
 
     local git_dir = get_git_dir()
-
-    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
+    cmderGitStatusOptIn = get_git_status_setting()
+    if git_dir then
+        local branch = get_git_branch(git_dir)
         if branch then
+            -- If in a different repo or branch than last time, discard cached info.
+            if cached_info.git_dir ~= git_dir or cached_info.git_branch ~= branch then
+                cached_info.git_info = nil
+                cached_info.git_dir = git_dir
+                cached_info.git_branch = branch
+            end
+            -- Use git status if allowed.
+            if cmderGitStatusOptIn then
+                -- if we're inside of git repo then try to detect current branch
                 -- Has branch => therefore it is a git folder, now figure out status
-              local gitStatus = get_git_status()
-              local gitConflict = get_git_conflict()
+                local gitInfo = get_git_info_table()
+                local gitStatus = gitInfo.status
+                local gitConflict = gitInfo.conflict
 
-              color = colors.dirty
-              if gitStatus then
+                if gitStatus == nil then
+                    color = colors.nostatus
+                elseif gitStatus then
                     color = colors.clean
+                else
+                    color = colors.dirty
                 end
 
                 if gitConflict then
                     color = colors.conflict
                 end
-
-              clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..verbatim(branch)..")")
-              return false
+            else
+                color = colors.nostatus
             end
+            clink.prompt.value = string.gsub(clink.prompt.value, "{git}", " "..color.."("..verbatim(branch)..")")
+            return false
         end
     end
 
@@ -341,19 +519,22 @@ end
 
 local function hg_prompt_filter()
 
+    -- Don't do any hg processing if the prompt doesn't want to show hg info.
+    if not clink.prompt.value:find("{hg}") then
+        return false
+    end
+
     local result = ""
 
     local hg_dir = get_hg_dir()
     if hg_dir then
         -- Colors for mercurial status
         local colors = {
-            clean = "\x1b[1;37;40m",
-            dirty = "\x1b[31;1m",
+            clean = get_clean_color(),
+            dirty = get_dirty_color(),
+            nostatus = get_unknown_color()
         }
-
-        local pipe = io.popen("hg branch 2>&1")
-        local output = pipe:read('*all')
-        local rc = { pipe:close() }
+        local output = get_hg_branch()
 
         -- strip the trailing newline from the branch name
         local n = #output
@@ -374,56 +555,71 @@ local function hg_prompt_filter()
         end
     end
 
-    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", verbatim(result))
+    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", " "..verbatim(result))
     return false
 end
 
 local function svn_prompt_filter()
+
+    -- Don't do any svn processing if the prompt doesn't want to show svn info.
+    if not clink.prompt.value:find("{svn}") then
+        return false
+    end
+
     -- Colors for svn status
     local colors = {
-        clean = "\x1b[1;37;40m",
-        dirty = "\x1b[31;1m",
+        clean = get_clean_color(),
+        dirty = get_dirty_color(),
+        nostatus = get_unknown_color()
     }
 
-    if get_svn_dir() then
+    local svn_dir = get_svn_dir()
+    if svn_dir then
         -- if we're inside of svn repo then try to detect current branch
         local branch = get_svn_branch()
         local color
         if branch then
-            if get_svn_status() then
+            -- If in a different repo or branch than last time, discard cached info
+            if cached_info.svn_dir ~= svn_dir or cached_info.svn_branch ~= branch then
+                cached_info.svn_info = nil
+                cached_info.svn_dir = svn_dir
+                cached_info.svn_branch = branch
+            end
+            -- Get the svn status using coroutine if available and option is enabled. Otherwise use a blocking call
+            local svnStatus
+            if clink.promptcoroutine and io.popenyield and settings.get("prompt.async") and prompt_overrideSvnStatusOptIn then
+                svnStatus = clink_promptcoroutine(function ()
+                    return get_svn_status()
+                end)
+                -- If the status result is pending, use the cached version instead, otherwise store it to the cache
+                if svnStatus == nil then
+                    svnStatus = cached_info.svn_info
+                else
+                    cached_info.svn_info = svnStatus
+                end
+            else
+                svnStatus = get_svn_status()
+            end
+
+            if svnStatus == nil then
+                color = colors.nostatus
+            elseif svnStatus then
                 color = colors.clean
             else
                 color = colors.dirty
             end
 
-            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", color.."("..verbatim(branch)..")")
+            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", " "..color.."("..verbatim(branch)..")")
             return false
         end
     end
 
-    -- No mercurial present or not in mercurial file
+    -- No svn present or not in svn file
     clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", "")
     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)

vendor/clink_settings.default

@@ -1,116 +1,19 @@
-# name: Pressing Ctrl-D exits session
-# type: bool
-# Ctrl-D exits cmd.exe when it is pressed on an empty line.
-ctrld_exits = 1
-
-# name: Toggle if pressing Esc clears line
-# type: bool
-# Clink clears the current line when Esc is pressed (unless Readline's Vi mode
-# is enabled).
-esc_clears_line = 1
-
-# name: Match display colour
-# type: int
-# Colour to use when displaying matches. A value less than 0 will be the
-# opposite brightness of the default colour.
-match_colour = -1
-
-# name: Executable match style
-# type: enum
-#  0 = PATH only
-#  1 = PATH and CWD
-#  2 = PATH, CWD, and directories
-# Changes how Clink will match executables when there is no path separator on
-# the line. 0 = PATH only, 1 = PATH and CWD, 2 = PATH, CWD, and directories. In
-# all cases both executables and directories are matched when there is a path
-# separator present. A value of -1 will disable executable matching completely.
-exec_match_style = 2
-
-# name: Whitespace prefix matches files
-# type: bool
-# If the line begins with whitespace then Clink bypasses executable matching and
-# will match all files and directories instead.
-space_prefix_match_files = 1
-
-# name: Colour of the prompt
-# type: int
-# Surrounds the prompt in ANSI escape codes to set the prompt's colour. Disabled
-# when the value is less than 0.
-prompt_colour = -1
-
-# name: Auto-answer terminate prompt
-# type: enum
-#  0 = Disabled
-#  1 = Answer 'Y'
-#  2 = Answer 'N'
-# Automatically answers cmd.exe's 'Terminate batch job (Y/N)?' prompts. 0 =
-# disabled, 1 = answer 'Y', 2 = answer 'N'.
-terminate_autoanswer = 0
-
-# name: Lines of history saved to disk
-# type: int
-# When set to a positive integer this is the number of lines of history that
-# will persist when Clink saves the command history to disk. Use 0 for infinite
-# lines and <0 to disable history persistence.
-history_file_lines = 10000
-
-# name: Skip adding lines prefixed with whitespace
-# type: bool
-# Ignore lines that begin with whitespace when adding lines in to the history.
-history_ignore_space = 0
-
-# name: Controls how duplicate entries are handled
-# type: enum
-#  0 = Always add
-#  1 = Ignore
-#  2 = Erase previous
-# If a line is a duplicate of an existing history entry Clink will erase the
-# duplicate when this is set 2. A value of 1 will not add duplicates to the
-# history and a value of 0 will always add lines. Note that history is not
-# deduplicated when reading/writing to disk.
-history_dupe_mode = 2
-
-# name: Read/write history file each line edited
-# type: bool
-# When non-zero the history will be read from disk before editing a new line and
-# written to disk afterwards.
-history_io = 1
+# For explanation of these and other settings see:
+# https://chrisant996.github.io/clink/clink.html
 
 # name: Sets how command history expansion is applied
 # type: enum
-#  0 = Off
-#  1 = On
-#  2 = Not in single quotes
-#  3 = Not in double quote
-#  4 = Not in any quotes
-# The '!' character in an entered line can be interpreted to introduce words
-# from the history. This can be enabled and disable by setting this value to 1
-# or 0. Values or 2, 3 or 4 will skip any ! character quoted in single, double,
-# or both quotes respectively.
-history_expand_mode = 3
+# options: off,on,not_squoted,not_dquoted,not_quoted
+history.expand_mode = not_dquoted
 
-# name: Support Windows' Ctrl-Alt substitute for AltGr
-# type: bool
-# Windows provides Ctrl-Alt as a substitute for AltGr, historically to support
-# keyboards with no AltGr key. This may collide with some of Readline's
-# bindings.
-use_altgr_substitute = 1
+# name: Skip adding lines prefixed with whitespace
+# type: boolean
+history.ignore_space = False
 
-# name: Strips CR and LF chars on paste
-# type: enum
-#  0 = Paste unchanged
-#  1 = Strip
-#  2 = As space
-# Setting this to a value >0 will make Clink strip CR and LF characters from
-# text pasted into the current line. Set this to 1 to strip all newline
-# characters and 2 to replace them with a space.
-strip_crlf_on_paste = 2
-
-# name: Enables basic ANSI escape code support
-# type: bool
-# When printing the prompt, Clink has basic built-in support for SGR ANSI escape
-# codes to control the text colours. This is automatically disabled if a third
-# party tool is detected that also provides this facility. It can also be
-# disabled by setting this to 0.
-ansi_code_support = 1
+# name: The number of history lines to save
+# type: integer
+history.max_lines = 10000
 
+# name: Share history between instances
+# type: boolean
+history.shared = True

vendor/cmder.sh

@@ -42,10 +42,10 @@ elif [ -d "${CMDER_ROOT}/vendor/git-for-windows" ] ; then
 fi
 
 if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then
-  PATH=${GIT_INSTALL_ROOT}/bin:$PATH
+  PATH="${GIT_INSTALL_ROOT}/bin:$PATH"
 fi
 
-PATH=${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}
+PATH="${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}"
 
 export PATH
 
@@ -80,7 +80,7 @@ if [ "${CMDER_USER_CONFIG}" != "" ] ; then
     mv "$CMDER_USER_CONFIG/user-profile.sh" "$CMDER_USER_CONFIG/user_profile.sh"
   fi
 
-  export PATH=${CMDER_USER_CONFIG}/bin:$PATH
+  export PATH="${CMDER_USER_CONFIG}/bin:$PATH"
 
   CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
   if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then

vendor/cmder_exinit

@@ -10,7 +10,7 @@
 # zsh  - Copy to /etc/profile.d/cmder_exinit.zsh
 # Add portable user customizations ${CMDER_ROOT}/config/user-profile.sh or
 # add whole config scripts to ${CMDER_ROOT}/config/profile.d both will be sourced
-# from mthis file and be appied to the environment at startup.
+# from this file and be applied to the environment at startup.
 #
 # These customizations will follow Cmder if $CMDER_ROOT is copied
 # to another machine.

vendor/cmder_prompt_config.lua.default

@@ -0,0 +1,60 @@
+-- All of the below was 'borrowed' from https://github.com/AmrEldib/cmder-powerline-prompt
+
+--- REQUIRED. config_prompt_type is whether the displayed prompt is the full path or only the folder name
+ -- Use:
+ -- "full" for full path like C:\Windows\System32
+ -- "folder" for folder name only like System32
+ -- default is full
+prompt_type = "full"
+
+--- REQUIRED. config_prompt_useHomeSymbol is whether to show ~ instead of the full path to the user's home folder
+ -- Use true or false
+ -- default is false
+prompt_useHomeSymbol = false
+
+-- Symbols
+-- REQUIRED. Prompt displayed instead of user's home folder e.g. C:\Users\username
+ -- default is '~'
+prompt_homeSymbol = "~"
+
+-- REQUIRED. Symbol displayed in the new line below the prompt.
+ -- default is 'λ'
+prompt_lambSymbol = "λ"
+
+-- REQUIRED. Adds [user]@[host] to the beginning of the prompt like bash
+ -- default is false
+prompt_useUserAtHost = false
+
+-- REQUIRED. If true prompt is a single line instead of default two line prompt.
+ -- default is false
+prompt_singleLine = false
+
+-- OPTIONAL. If true then Cmder includes git, mercurial, and subversion status in the prompt.
+ -- default is true
+prompt_includeVersionControl = true
+
+-- OPTIONAL. If true then always ignore the cmder.status and cmder.cmdstatus git config settings and run the git prompt commands in the background.
+ -- default is false
+ -- NOTE: This only takes effect if using Clink v1.2.10 or higher.
+prompt_overrideGitStatusOptIn = false
+
+-- OPTIONAL. If true then always ignore the cmder.status and cmder.cmdstatus svn config settings and run the svn prompt commands in the background.
+ -- default is false
+ -- NOTE: This only takes effect if using Clink v1.2.10 or higher.
+prompt_overrideSvnStatusOptIn = false
+
+-- Prompt Attributes
+--
+-- Colors
+-- Green:      "\x1b[1;33;49m"
+-- Yellow:     "\x1b[1;32;49m"
+-- Light Grey: "\x1b[1;30;49m"
+
+-- Prompt Element Colors
+uah_color = "\x1b[1;33;49m" -- Green = uah = [user]@[hostname]
+cwd_color = "\x1b[1;32;49m" -- Yellow cwd = Current Working Directory
+lamb_color = "\x1b[1;30;49m" -- Light Grey = Lambda Color
+clean_color = "\x1b[1;37;49m"
+dirty_color = "\x1b[33;3m"
+conflict_color = "\x1b[31;1m"
+unknown_color = "\x1b[37;1m" -- White = No VCS Status Branch Color

vendor/git-prompt.sh

@@ -9,6 +9,21 @@ function getGitStatusSetting() {
   fi
 }
 
+function getSimpleGitBranch() {
+  gitDir=$(git rev-parse --git-dir 2>/dev/null)
+  if [ -z "$gitDir" ]; then
+    return 0
+  fi
+
+  headContent=$(< "$gitDir/HEAD")
+  if [[ "$headContent" == "ref: refs/heads/"* ]]
+  then
+    echo " (${headContent:16})"
+  else
+  echo " (HEAD detached at ${headContent:0:7})"
+  fi
+}
+
 if test -f /etc/profile.d/git-sdk.sh
 then
   TITLEPREFIX=SDK-${MSYSTEM#MINGW}
@@ -45,6 +60,9 @@ else
         . "$COMPLETION_PATH/git-prompt.sh"
         PS1="$PS1"'\[\033[36m\]'  # change color to cyan
         PS1="$PS1"'`__git_ps1`'   # bash function
+      else
+        PS1="$PS1"'\[\033[37;1m\]'  # change color to white
+        PS1="$PS1"'`getSimpleGitBranch`'
       fi
     fi
   fi

vendor/init.bat

@@ -67,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" (
@@ -88,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" (
@@ -110,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" (
@@ -125,13 +125,13 @@ 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"
+    if not exist "%CMDER_USER_CONFIG%\..\opt" md "%CMDER_USER_CONFIG%\..\opt"
 )
 
 :: Pick right version of clink
@@ -144,39 +144,73 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
 )
 
 if "%CMDER_CLINK%" == "1" (
-  %lib_console% verbose_output "Injecting Clink!"
+  %print_verbose% "Injecting Clink!"
 
   :: Run clink
   if defined CMDER_USER_CONFIG (
-    if not exist "%CMDER_USER_CONFIG%\settings" (
-      echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
-      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
-      echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
+    if not exist "%CMDER_USER_CONFIG%\settings" if not exist "%CMDER_USER_CONFIG%\clink_settings" (
+      echo Generating clink initial settings in "%CMDER_USER_CONFIG%\clink_settings"
+      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\clink_settings"
+      echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.
+    )
+
+    if not exist "%CMDER_USER_CONFIG%\cmder_prompt_config.lua" (
+      echo Creating Cmder prompt config file: "%CMDER_USER_CONFIG%\cmder_prompt_config.lua"
+      copy "%CMDER_ROOT%\vendor\cmder_prompt_config.lua.default" "%CMDER_USER_CONFIG%\cmder_prompt_config.lua"
+    )
+
+    REM Cleanup lagacy Clink Settings file
+    if exist "%CMDER_USER_CONFIG%\settings" if exist "%CMDER_USER_CONFIG%\clink_settings" (
+      del "%CMDER_USER_CONFIG%\settings"
+    )
+
+    REM Cleanup legacy CLink history file
+    if exist "%CMDER_USER_CONFIG%\.history" if exist "%CMDER_USER_CONFIG%\clink_history" (
+      del "%CMDER_USER_CONFIG%\.history"
     )
     "%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"
+    if not exist "%CMDER_ROOT%\config\settings" if not exist "%CMDER_ROOT%\config\clink_settings" (
+      echo Generating clink initial settings in "%CMDER_ROOT%\config\clink_settings"
+      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\clink_settings"
       echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
     )
+
+    if not exist "%CMDER_ROOT%\config\cmder_prompt_config.lua" (
+      echo Creating Cmder prompt config file: "%CMDER_ROOT%\config\cmder_prompt_config.lua"
+      copy "%CMDER_ROOT%\vendor\cmder_prompt_config.lua.default" "%CMDER_ROOT%\config\cmder_prompt_config.lua"
+    )
+
+    REM Cleanup lagacy Clink Settings file
+    if exist "%CMDER_ROOT%\config\settings" if exist "%CMDER_ROOT%\config\clink_settings" (
+      del "%CMDER_ROOT%\config\settings"
+    )
+
+    REM Cleanup legacy Clink history file
+    if exist "%CMDER_ROOT%\config\.history" if exist "%CMDER_ROOT%\config\clink_history" (
+      del "%CMDER_ROOT%\config\.history"
+    )
+
     "%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%" == "1" (
-  echo Cmder is already configured, skipping Cmder Init!
+if "%CMDER_CONFIGURED%" GTR "1" (
+  %print_verbose% "Cmder is already configured, skipping Cmder Init!"
 
-  goto CMDER_CONFIGURED
+  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
 
 :: I do not even know, copypasted from their .bat
 set PLINK_PROTOCOL=ssh
-if not defined TERM set TERM=cygwin
 
 :: The idea:
 :: * if the users points as to a specific git, use that
@@ -187,68 +221,70 @@ 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% init.bat "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 (
+for /F "delims=" %%F in ('where git.exe 2^>nul ^| find "\cmd\git.exe"') do (
     :: get the absolute path to the user provided git binary
     %lib_git% is_git_shim "%%~dpF"
     %lib_git% get_user_git_version
     %lib_git% compare_git_versions
-)
 
-if defined GIT_INSTALL_ROOT (
+    if defined GIT_INSTALL_ROOT (
         goto :FOUND_GIT
+    )
 )
 
 :: our last hope: our own git...
 :VENDORED_GIT
 if exist "%CMDER_ROOT%\vendor\git-for-windows" (
     set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
-    %lib_console% debug_output "Using vendored Git '%GIT_VERSION_VENDORED%'..."
+    %print_debug% init.bat "Using vendored Git '%GIT_VERSION_VENDORED%'..."
     goto :CONFIGURE_GIT
 ) else (
     goto :NO_GIT
 )
 
 :SPECIFIED_GIT
-%lib_console% debug_output "Using /GIT_INSTALL_ROOT..."
+%print_debug% init.bat "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% init.bat "Using found Git '%GIT_VERSION_USER%' from '%GIT_INSTALL_ROOT%..."
 goto :CONFIGURE_GIT
 
 :CONFIGURE_GIT
-%lib_console% debug_output "Using Git from '%GIT_INSTALL_ROOT%..."
+%print_debug% init.bat "Using Git from '%GIT_INSTALL_ROOT%..."
 :: Add git to the path
-rem add the unix commands at the end to not shadow windows commands like more
+if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" %lib_path% enhance_path "%GIT_INSTALL_ROOT%\cmd" ""
+
+:: 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"
+    %print_verbose% "Preferring Windows commands"
     set "path_position=append"
 ) else (
-    %lib_console% debug_output init.bat "Preferring *nix commands"
+    %print_verbose% "Preferring *nix commands"
     set "path_position="
 )
 
-if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" %lib_path% enhance_path "%GIT_INSTALL_ROOT%\cmd" %path_position%
 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%
     )
-
+    if exist "%GIT_INSTALL_ROOT%\usr\bin" (
         %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position%
+    )
 )
 
 :: define SVN_SSH so we can use git svn with ssh svn repositories
@@ -260,17 +296,20 @@ if not defined git_locale for /F "tokens=* delims=" %%F in ('where locale.exe 2^
 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 (
-  %lib_console% debug_output init.bat "Env Var - git_locale=%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 (
+      for /F "delims=" %%F in ('!git_locale! -uU 2') do (
           set "LANG=%%F"
       )
   )
 )
+endlocal && set LANG=%LANG%
 
-%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%'"
+%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
@@ -294,6 +333,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.
 ::
@@ -336,8 +376,17 @@ if "%CMDER_ALIASES%" == "1" (
 )
 
 :: Add aliases to the environment
+type "%user_aliases%" | findstr /b /l /i "history=cat " >nul
+if "%ERRORLEVEL%" == "0" (
+  echo Migrating alias 'history' to new Clink 1.x.x...
+  call "%CMDER_ROOT%\vendor\bin\alias.cmd" /d history
+  echo Restart the session to activate changes!
+)
+
 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
@@ -350,12 +399,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"
 )
 
@@ -363,7 +412,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"
   )
 )
@@ -389,11 +438,11 @@ if "%CMDER_ALIASES%" == "1" if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMD
 set initialConfig=
 
 :CMDER_CONFIGURED
-set CMDER_CONFIGURED=1
+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

vendor/lib/lib_base.cmd

@@ -61,22 +61,21 @@ exit /b
 :::       file <in> full path to file containing lib_routines to display
 :::.
 :::-------------------------------------------------------------------------------
-    echo %comspec% | %WINDIR%\System32\find /i "\cmd.exe" > nul && set "CMDER_SHELL=cmd"
-    echo %comspec% | %WINDIR%\System32\find /i "\tcc.exe" > nul && set "CMDER_SHELL=tcc"
-    echo %comspec% | %WINDIR%\System32\find /i "\tccle" > nul && set "CMDER_SHELL=tccle"
+    call :detect_comspec %ComSpec%
+    exit /b
 
+:detect_comspec
+    set CMDER_SHELL=%~n1
     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
     )
-
     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
     )
-
     exit /b
 
 :update_legacy_aliases

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 "" (

vendor/lib/lib_git.cmd

@@ -14,7 +14,7 @@ exit /b
 
 :read_version
 :::===============================================================================
-:::read_version - Get the git.exe verion
+:::read_version - Get the git.exe version
 :::.
 :::include:
 :::.
@@ -39,28 +39,27 @@ exit /b
 
     :: 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
-
     "%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"
         ) else (
-            echo "'git --version' returned an inproper version string!"
+            echo "'git --version' returned an improper version string!"
             pause
             exit /b
         )
     )
-    endlocal & set "GIT_VERSION_%~1=%GIT_VERSION%" & %lib_console% debug_output :read_version "Env Var - GIT_VERSION_%~1=%GIT_VERSION%"
+    endlocal & set "GIT_VERSION_%~1=%GIT_VERSION%" & %print_debug% :read_version "Env Var - GIT_VERSION_%~1=%GIT_VERSION%"
 
     exit /b
 
@@ -90,7 +89,7 @@ exit /b
 :::-------------------------------------------------------------------------------
 
     :: process a `x.x.x.xxxx.x` formatted string
-    %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 (
@@ -130,16 +129,16 @@ 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.
-    REM %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" (
-      %lib_console% debug_output :validate_version "Found Git Version for %~1: %VENDORED_MAJOR%.%VENDORED_MINOR%.%VENDORED_PATCH%.%VENDORED_BUILD%"
+      %print_debug% :validate_version "Found Git Version for %~1: %VENDORED_MAJOR%.%VENDORED_MINOR%.%VENDORED_PATCH%.%VENDORED_BUILD%"
     ) else (
-      %lib_console% debug_output :validate_version "Found Git Version for %~1: %USER_MAJOR%.%USER_MINOR%.%USER_PATCH%.%USER_BUILD%"
+      %print_debug% :validate_version "Found Git Version for %~1: %USER_MAJOR%.%USER_MINOR%.%USER_PATCH%.%USER_BUILD%"
     )
     exit /b
 
@@ -164,9 +163,9 @@ 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: %USER_MAJOR%.%USER_MINOR%.%USER_PATCH%.%USER_BUILD%
-    %lib_console% debug_output %~2: %VENDORED_MAJOR%.%VENDORED_MINOR%.%VENDORED_PATCH%.%VENDORED_BUILD%
+    %print_debug% ":compare_versions" "Comparing:"
+    %print_debug% ":compare_versions" "%~1: %USER_MAJOR%.%USER_MINOR%.%USER_PATCH%.%USER_BUILD%"
+    %print_debug% ":compare_versions" "%~2: %VENDORED_MAJOR%.%VENDORED_MINOR%.%VENDORED_PATCH%.%VENDORED_BUILD%"
 
     setlocal enabledelayedexpansion
     if !%~1_MAJOR! GTR !%~2_MAJOR! (endlocal & exit /b  1)
@@ -231,29 +230,34 @@ exit /b
 :::-------------------------------------------------------------------------------
 
 :compare_git_versions
-    if %errorlevel% geq 0 (
+    setlocal enabledelayedexpansion
+    if ERRORLEVEL 0 (
         :: compare the user git version against the vendored version
         %lib_git% compare_versions USER VENDORED
+        set result=!ERRORLEVEL!
+        %print_debug% ":compare_git_versions" "campare versions_result: !result!"
 
         :: 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=
-        ) else if %errorlevel% geq 0 (
-            set "GIT_INSTALL_ROOT=%test_dir%"
-            set test_dir=
+        if !result! geq 0 (
+            if exist "!test_dir:~0,-4!\cmd\git.exe" (
+                set "GIT_INSTALL_ROOT=!test_dir:~0,-4!"
             ) else (
-            call :verbose_output Found old %GIT_VERSION_USER% in "%test_dir%", but not using...
-            set test_dir=
+                set "GIT_INSTALL_ROOT=!test_dir!"
+            )
+        ) else (
+            %print_debug% ":compare_git_versions" "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% equ -255 (
-            call :verbose_output No git at "%git_executable%" found.
+        IF ERRORLEVEL -255 IF NOT ERRORLEVEL -254 (
+        :: if not exist "%git_executable%" (
+            %print_debug% ":compare_git_versions" "No git at "%git_executable%" found."
             set test_dir=
         )
     )
+    endlocal && set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%" && set test_dir=
+
     exit /b
 
 :::===============================================================================
@@ -270,7 +274,8 @@ exit /b
 
 :get_user_git_version
     :: get the version information for the user provided git binary
-    %lib_git% read_version USER "%test_dir%"
+    %lib_git% read_version USER "%test_dir%" 2>nul
+    %print_debug% ":get_user_git_version" "get_user_git_version GIT_VERSION_USER: %GIT_VERSION_USER%"
     %lib_git% validate_version USER %GIT_VERSION_USER%
     exit  /b
 

vendor/lib/lib_path.cmd

@@ -32,6 +32,7 @@ exit /b
 :::options:
 :::
 :::  append     <in> Append to the path env variable rather than pre-pend.
+::B
 :::
 :::output:
 :::
@@ -41,7 +42,7 @@ exit /b
     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
     )
 
@@ -73,36 +74,36 @@ exit /b
     set "find_query=%add_to_path%"
     set "find_query=%find_query:\=\\%"
     set "find_query=%find_query: =\ %"
-    set OLD_PATH=%PATH%
+    set "OLD_PATH=%PATH%"
 
     setlocal enabledelayedexpansion
-    if "%found%" == "0" (
-      echo "%path%"|%WINDIR%\System32\findstr >nul /I /R /C:";%find_query%;"
-      call :set_found
-    )
-    %lib_console% debug_output  :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%\"$"
+      echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!;"
       call :set_found
     )
-      %lib_console% debug_output  :enhance_path "Env Var END PATH %find_query% - found=!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%;"
+        echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:"^\"!find_query!;"
         call :set_found
       )
-      %lib_console% debug_output  :enhance_path "Env Var BEGIN PATH %find_query% - found=!found!"
+      %print_debug%  :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!"
     )
     endlocal & set found=%found%
 
     if "%found%" == "0" (
         if /i "%position%" == "append" (
-            %lib_console% debug_output :enhance_path "Appending '%add_to_path%'"
+            %print_debug% :enhance_path "Appending '%add_to_path%'"
             set "PATH=%PATH%;%add_to_path%"
         ) else (
-            %lib_console% debug_output :enhance_path "Prepending '%add_to_path%'"
+            %print_debug% :enhance_path "Prepending '%add_to_path%'"
             set "PATH=%add_to_path%;%PATH%"
         )
 
@@ -111,13 +112,30 @@ exit /b
 
     :end_enhance_path
     set "PATH=%PATH:;;=;%"
-    if NOT "%OLD_PATH%" == "%PATH%" (
-      %lib_console% debug_output  :enhance_path "END Env Var - PATH=%path%"
-      %lib_console% debug_output  :enhance_path "Env Var %find_query% - found=%found%"
-    )
-    set "position="
+
+    REM echo %path%|"C:\Users\dgames\cmder - dev\vendor\git-for-windows\usr\bin\wc" -c
+    if "%fast_init%" == "1" exit /b
+
+    if not "%OLD_PATH:~0,3000%" == "%OLD_PATH:~0,3001%" goto :toolong
+    if not "%OLD_PATH%" == "%PATH%" goto :changed
     exit /b
 
+    :toolong
+      echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
+      echo "%PATH%">"%temp%\cmder_lib_pathB"
+      fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
+      if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
+      del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
+      exit /b
+
+    :changed
+      %print_debug%  :enhance_path "END Env Var - PATH=%path%"
+      %print_debug%  :enhance_path "Env Var %find_query% - found=%found%"
+      exit /b
+
+    exit /b
+
+
 :set_found
     if "%ERRORLEVEL%" == "0" (
       set found=1
@@ -144,7 +162,7 @@ exit /b
 :::.
 :::options:
 :::.
-:::  [max_depth] <in> Max recuse depth.  Default: 1
+:::  [max_depth] <in> Max recursion depth.  Default: 1
 :::.
 :::  append      <in> Append instead to path env variable rather than pre-pend.
 :::.
@@ -155,7 +173,7 @@ exit /b
     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
     )
 
@@ -168,7 +186,8 @@ exit /b
         set "position="
     )
 
-    dir "%add_path%" | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
+    dir "%add_path%" 2>NUL | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
+
     if "%ERRORLEVEL%" == "0" (
         set "add_to_path=%add_path%"
     ) else (
@@ -186,14 +205,14 @@ exit /b
       exit /b
     )
 
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - add_path=%add_to_path%"
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - position=%position%"
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - depth=%depth%"
-    %lib_console% debug_output  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
+    %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 "" (
-            %lib_console% debug_output :enhance_path_recursive "Adding parent directory - '%add_to_path%'"
+            %print_debug% :enhance_path_recursive "Adding parent directory - '%add_to_path%'"
             call :enhance_path "%add_to_path%" %position%
         )
         call :set_depth
@@ -214,10 +233,10 @@ exit /b
     )
 
     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'"
+        %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%
-        %lib_console% debug_output  :enhance_path_recursive "Env Var AFTER- depth=%depth%"
+        %print_debug%  :enhance_path_recursive "Env Var AFTER- depth=%depth%"
     )
     exit /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

vendor/profile.ps1

@@ -1,31 +1,33 @@
-# Init Script for PowerShell
+# Init Script for PowerShell
 # Created as part of cmder project
 
 # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 # !!! Use "%CMDER_ROOT%\config\user_profile.ps1" to add your own startup commands
 
+$CMDER_INIT_START = $(Get-Date -UFormat %s)
+
 # Compatibility with PS major versions <= 2
-if(!$PSScriptRoot) {
+if (!$PSScriptRoot) {
     $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path
 }
 
 if ($ENV:CMDER_USER_CONFIG) {
-    # write-host "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
+    # Write-Host "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
 }
 
-# We do this for Powershell as Admin Sessions because CMDER_ROOT is not beng set.
-if (! $ENV:CMDER_ROOT ) {
-    if ( $ENV:ConEmuDir ) {
-        $ENV:CMDER_ROOT = resolve-path( $ENV:ConEmuDir + "\..\.." )
+# We do this for Powershell as Admin Sessions because CMDER_ROOT is not being set.
+if ($null -eq $ENV:CMDER_ROOT) {
+    if (-Not($null -eq $ENV:ConEmuDir)) {
+        $ENV:CMDER_ROOT = Resolve-Path($ENV:ConEmuDir + "\..\..")
     } else {
-        $ENV:CMDER_ROOT = resolve-path( $PSScriptRoot + "\.." )
+        $ENV:CMDER_ROOT = Resolve-Path($PSScriptRoot + "\..")
     }
 }
 
 # Remove trailing '\'
-$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
+$ENV:CMDER_ROOT = ($ENV:CMDER_ROOT).trimend("\")
 
-# Do not load bundled psget if a module installer is already available
+# Do not load bundled PsGet if a module installer is already available
 # -> recent PowerShell versions include PowerShellGet out of the box
 $moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue)
 
@@ -35,39 +37,74 @@ $CmderModulePath = Join-path $PSScriptRoot "psmodules/"
 $CmderFunctions  = Join-Path $CmderModulePath "Cmder.ps1"
 . $CmderFunctions
 
-if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ){
+if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ) {
     $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }
 
-try {
-    # Check if git is on PATH, i.e. Git already installed on system
-    Get-command -Name "git" -ErrorAction Stop >$null
-} catch {
-    if (test-path "$env:CMDER_ROOT\vendor\git-for-windows") {
-        Configure-Git "$env:CMDER_ROOT\vendor\git-for-windows"
+$gitVersionVendor = (readVersion -gitPath "$ENV:CMDER_ROOT\vendor\git-for-windows\cmd")
+# Write-Host "GIT VENDOR: ${gitVersionVendor}"
+
+# Get user installed Git Version[s] and Compare with vendored if found.
+foreach ($git in (Get-Command -ErrorAction SilentlyContinue 'git')) {
+    # Write-Host "GIT PATH: " + $git.Path
+    $gitDir = Split-Path -Path $git.Path
+    $gitDir = isGitShim -gitPath $gitDir
+    $gitVersionUser = (readVersion -gitPath $gitDir)
+    # Write-Host "GIT USER: ${gitVersionUser}"
+
+    $useGitVersion = compare_git_versions -userVersion $gitVersionUser -vendorVersion $gitVersionVendor
+    # Write-Host "Using GIT Version: ${useGitVersion}"
+
+    # Use user installed Git
+    if ($null -eq $gitPathUser) {
+        if ($gitDir -match '\\mingw32\\bin' -or $gitDir -match '\\mingw64\\bin') {
+            $gitPathUser = ($gitDir.subString(0,$gitDir.Length - 12))
+        } else {
+            $gitPathUser = ($gitDir.subString(0,$gitDir.Length - 4))
+        }
+    }
+
+    if ($useGitVersion -eq $gitVersionUser) {
+        # Write-Host "Using GIT Dir: ${gitDir}"
+        $ENV:GIT_INSTALL_ROOT = $gitPathUser
+        $ENV:GIT_INSTALL_TYPE = 'USER'
+        break
     }
 }
 
-if ( Get-command -Name "vim" -ErrorAction silentlycontinue) {
-    new-alias -name "vi" -value vim
+# User vendored Git.
+if ($null -eq $ENV:GIT_INSTALL_ROOT -and $null -ne $gitVersionVendor) {
+    $ENV:GIT_INSTALL_ROOT = "$ENV:CMDER_ROOT\vendor\git-for-windows"
+    $ENV:GIT_INSTALL_TYPE = 'VENDOR'
+}
+
+# Write-Host "GIT_INSTALL_ROOT: ${ENV:GIT_INSTALL_ROOT}"
+# Write-Host "GIT_INSTALL_TYPE: ${ENV:GIT_INSTALL_TYPE}"
+
+if (-Not ($null -eq $ENV:GIT_INSTALL_ROOT)) {
+    $env:Path = Configure-Git -gitRoot "$ENV:GIT_INSTALL_ROOT" -gitType $ENV:GIT_INSTALL_TYPE -gitPathUser $gitPathUser
+}
+
+if (Get-Command -Name "vim" -ErrorAction silentlycontinue) {
+    New-Alias -name "vi" -value vim
 }
 
 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.
+# 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)"
+    Write-Host -NoNewline "PS "
     Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
-    if (get-command git -erroraction silentlycontinue) {
+    if (Get-Command git -erroraction silentlycontinue) {
         checkGit($pwd.ProviderPath)
     }
-    Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
+    Microsoft.PowerShell.Utility\Write-Host "`nλ" -NoNewLine -ForegroundColor "DarkGray"
 }
 
 # Enhance Path
@@ -75,41 +112,41 @@ $env:Path = "$Env:CMDER_ROOT\bin;$Env:CMDER_ROOT\vendor\bin;$env:Path;$Env:CMDER
 
 # Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d"
 # to source them at startup.
-if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
-  mkdir "$ENV:CMDER_ROOT\config\profile.d"
+if (-Not (Test-Path -PathType container "$ENV:CMDER_ROOT\config\profile.d")) {
+    New-Item -ItemType Directory -Path "$ENV:CMDER_ROOT\config\profile.d"
 }
 
-pushd $ENV:CMDER_ROOT\config\profile.d
+Push-Location $ENV:CMDER_ROOT\config\profile.d
 foreach ($x in Get-ChildItem *.psm1) {
-  # write-host write-host Sourcing $x
+    # Write-Host Write-Host Sourcing $x
     Import-Module $x
 }
 
 foreach ($x in Get-ChildItem *.ps1) {
-  # write-host write-host Sourcing $x
+    # Write-Host Write-Host Sourcing $x
     . $x
 }
-popd
+Pop-Location
 
 # 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 (test-path "$ENV:CMDER_USER_CONFIG\profile.d")) {
-    pushd $ENV:CMDER_USER_CONFIG\profile.d
+if ($ENV:CMDER_USER_CONFIG -ne "" -And (Test-Path "$ENV:CMDER_USER_CONFIG\profile.d")) {
+    Push-Location $ENV:CMDER_USER_CONFIG\profile.d
     foreach ($x in Get-ChildItem *.psm1) {
-      # write-host write-host Sourcing $x
+        # Write-Host Write-Host Sourcing $x
         Import-Module $x
     }
 
     foreach ($x in Get-ChildItem *.ps1) {
-      # write-host write-host Sourcing $x
+        # Write-Host Write-Host Sourcing $x
         . $x
     }
-    popd
+    Pop-Location
 }
 
 # Renaming to "config\user_profile.ps1" to "user_profile.ps1" for consistency.
-if (test-path "$env:CMDER_ROOT\config\user-profile.ps1") {
-  rename-item  "$env:CMDER_ROOT\config\user-profile.ps1" user_profile.ps1
+if (Test-Path "$env:CMDER_ROOT\config\user-profile.ps1") {
+    Rename-Item  "$env:CMDER_ROOT\config\user-profile.ps1" user_profile.ps1
 }
 
 $CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user_profile.ps1"
@@ -120,8 +157,8 @@ if (Test-Path $CmderUserProfilePath) {
 
 if ($ENV:CMDER_USER_CONFIG) {
     # Renaming to "$env:CMDER_USER_CONFIG\user-profile.ps1" to "user_profile.ps1" for consistency.
-    if (test-path "$env:CMDER_USER_CONFIG\user-profile.ps1") {
-      rename-item  "$env:CMDER_USER_CONFIG\user-profile.ps1" user_profile.ps1
+    if (Test-Path "$env:CMDER_USER_CONFIG\user-profile.ps1") {
+        Rename-Item  "$env:CMDER_USER_CONFIG\user-profile.ps1" user_profile.ps1
     }
 
     $env:Path = "$Env:CMDER_USER_CONFIG\bin;$env:Path"
@@ -132,7 +169,7 @@ if ($ENV:CMDER_USER_CONFIG) {
     }
 }
 
-if (! (Test-Path $CmderUserProfilePath) ) {
+if (-Not (Test-Path $CmderUserProfilePath)) {
     Write-Host -BackgroundColor Darkgreen -ForegroundColor White "First Run: Creating user startup file: $CmderUserProfilePath"
     Copy-Item "$env:CMDER_ROOT\vendor\user_profile.ps1.default" -Destination $CmderUserProfilePath
 }
@@ -144,8 +181,8 @@ if (! (Test-Path $CmderUserProfilePath) ) {
 
 # Only set the prompt if it is currently set to the default
 # 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\)\) ";') {
+if ( $(Get-Command prompt).Definition -match 'PS \$\(\$executionContext.SessionState.Path.CurrentLocation\)\$\(' -and `
+    $(Get-Command prompt).Definition -match '\(\$nestedPromptLevel \+ 1\)\) ";') {
 
     <#
     This scriptblock runs every time the prompt is returned.
@@ -164,9 +201,9 @@ if ( $(get-command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
 
 
     # Once Created these code blocks cannot be overwritten
-  # if (-not $(get-command PrePrompt).Options -match 'Constant') {Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant}
-  # if (-not $(get-command CmderPrompt).Options -match 'Constant') {Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant}
-  # if (-not $(get-command PostPrompt).Options -match 'Constant') {Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant}
+    # if (-not $(Get-Command PrePrompt).Options -match 'Constant') {Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant}
+    # if (-not $(Get-Command CmderPrompt).Options -match 'Constant') {Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant}
+    # if (-not $(Get-Command PostPrompt).Options -match 'Constant') {Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant}
 
     Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant
     Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant
@@ -174,6 +211,9 @@ if ( $(get-command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
 
     # Functions can be made constant only at creation time
     # ReadOnly at least requires `-force` to be overwritten
-  # if (!$(get-command Prompt).Options -match 'ReadOnly') {Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly}
+    # if (!$(Get-Command Prompt).Options -match 'ReadOnly') {Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly}
     Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly
 }
+
+$CMDER_INIT_END = $(Get-Date -UFormat %s)
+# Write-Host "Elapsed Time: $(get-Date) `($($CMDER_INIT_END - $CMDER_INIT_START) total`)"

vendor/psmodules/Cmder.ps1

@@ -1,26 +1,128 @@
-function Configure-Git($GIT_INSTALL_ROOT){
-  $env:Path += $(";" + $GIT_INSTALL_ROOT + "\cmd")
+function readVersion($gitPath) {
+    $gitExecutable = "${gitPath}\git.exe"
 
-  # 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"
+    if (!(test-path "$gitExecutable")) {
+        return $null
     }
 
-  # 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"
+    $gitVersion = (cmd /c "${gitExecutable}" --version)
+
+    if ($gitVersion -match 'git version') {
+        ($trash1, $trash2, $gitVersion) = $gitVersion.split(' ', 3)
+    } else {
+        pause
+        return $null
+    }
+
+    return $gitVersion.toString()
+}
+
+function isGitShim($gitPath) {
+    # check if there's shim - and if yes follow the path
+
+    if (test-path "${gitPath}\git.shim") {
+      $shim = (get-content "${gitPath}\git.shim")
+      ($trash, $gitPath) = $shim.replace(' ','').split('=')
+
+      $gitPath=$gitPath.replace('\git.exe','')
+    }
+
+    return $gitPath.toString()
+}
+
+function compareVersions($userVersion, $vendorVersion) {
+    if (-not($userVersion -eq $null)) {
+        ($userMajor, $userMinor, $userPatch, $userBuild) = $userVersion.split('.', 4)
+    } else {
+        return -1
+    }
+
+    if (-not($vendorVersion -eq $null)) {
+        ($vendorMajor, $vendorMinor, $vendorPatch, $vendorBuild) = $vendorVersion.split('.', 4)
+    } else {
+        return 1
+    }
+
+    if (($userMajor -eq $vendorMajor) -and  ($userMinor -eq $vendorMinor) -and  ($userPatch -eq $vendorPatch) -and  ($userBuild -eq $vendorBuild)) {
+        return 1
+    }
+
+    if ($userMajor -gt $vendorMajor) {return 1}
+    if ($userMajor -lt $vendorMajor) {return -1}
+
+    if ($userMinor -gt $vendorMinor) {return 1}
+    if ($userMinor -lt $vendorMinor) {return -1}
+
+    if ($userPatch -gt $vendorPatch) {return 1}
+    if ($userPatch -lt $vendorPatch) {return -1}
+
+    if ($userBuild -gt $vendorBuild) {return 1}
+    if ($userBuild -lt $vendorBuild) {return -1}
+
+    return 0
+}
+
+function compare_git_versions($userVersion, $vendorVersion) {
+    $result = compareVersions -userVersion $userVersion -vendorVersion $vendorVersion
+
+    # write-host "Compare Versions Result: ${result}"
+    if ($result -ge 0) {
+        return $userVersion
+    } else {
+        return $vendorVersion
     }
 }
 
-function Import-Git(){
+function Configure-Git($gitRoot, $gitType, $gitPathUser){
+    # Proposed Behavior
 
+    # Modify the path if we are using VENDORED Git do nothing if using USER Git.
+    # If User Git is installed but older match its path config adding paths
+    # in the same path positions allowing a user to configure Cmder Git path
+    # using locally installed Git Path Config.
+    if ($gitType -eq 'VENDOR') {
+        # If User Git is installed replace its path config with Newer Vendored Git Path
+        if ($gitPathUser -ne '' -and $gitPathUser -ne $null) {
+            # write-host "Cmder 'profile.ps1': Replacing older user Git path '$gitPathUser' with newer vendored Git path '$gitRoot' in the system path..."
+
+            $newPath = ($env:path -ireplace [regex]::Escape($gitPathUser), $gitRoot)
+        } else {
+            if (!($env:Path -match [regex]::Escape("$gitRoot\cmd"))) {
+                # write-host "Adding $gitRoot\cmd to the path"
+                $newPath = $($gitRoot + "\cmd" + ";" + $env:Path)
+            }
+
+            # Add "$gitRoot\mingw[32|64]\bin" to the path if exists and not done already
+            if ((test-path "$gitRoot\mingw32\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\mingw32\bin"))) {
+                # write-host "Adding $gitRoot\mingw32\bin to the path"
+                $newPath = "$newPath;$gitRoot\mingw32\bin"
+            } elseif ((test-path "$gitRoot\mingw64\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\mingw64\bin"))) {
+                # write-host "Adding $gitRoot\mingw64\bin to the path"
+                $newPath = "$newPath;$gitRoot\mingw64\bin"
+            }
+
+            # Add "$gitRoot\usr\bin" to the path if exists and not done already
+            if ((test-path "$gitRoot\usr\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\usr\bin"))) {
+                # write-host "Adding $gitRoot\usr\bin to the path"
+                $newPath = "$newPath;$gitRoot\usr\bin"
+            }
+        }
+
+        return $newPath
+    }
+
+    return $env:path
+}
+
+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($GitModule | select version | where version -ge ([version]"1.0.0")){
+        Import-Module Posh-Git > $null
+        $GitPromptSettings.AnsiConsole = $false
+    }
     if(-not ($GitModule) ) {
         Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart cmder."
     }
@@ -36,6 +138,14 @@ function checkGit($Path) {
 
       if (getGitStatusSetting -eq $true) {
         Write-VcsStatus
+      } else {
+        $headContent = Get-Content (Join-Path $Path '.git/HEAD')
+        if ($headContent -like "ref: refs/heads/*") {
+            $branchName = $headContent.Substring(16)
+        } else {
+            $branchName = "HEAD detached at $($headContent.Substring(0, 7))"
+        }
+        Write-Host " [$branchName]" -NoNewline -ForegroundColor White
       }
 
       return

vendor/psmodules/PsGet/PsGet.psm1

@@ -124,7 +124,7 @@ Set-Variable -Name PSGET_PSD1 -Value 'PSD1' -Option Constant -Scope Script
 
         Description
         -----------
-        Installs the module witout importing it to the current session
+        Installs the module without importing it to the current session
 
     .EXAMPLE
         # Install-Module PoshHg -AddToProfile
@@ -448,7 +448,7 @@ function Update-Module {
 
         Description
         -----------
-        Retrieves information about all registerd modules that starts with PoshCo.
+        Retrieves information about all registered modules that start with PoshCo.
 #>
 function Get-PsGetModuleInfo {
     [CmdletBinding()]
@@ -694,7 +694,7 @@ function Install-ModuleFromDirectory {
             throw "Module $Module was not found in central repository"
         }
 
-        # $Module and $moduleData.Id are not equally by garantee, so we have to test again.
+        # $Module and $moduleData.Id are not equally by guarantee, so we have to test again.
         if (Test-ModuleInstalledAndImport -ModuleName:$moduleData.ModuleName -Destination:$Destination -Update:$Update -DoNotImport:$DoNotImport -ModuleHash:$ModuleHash) {
             return
         }
@@ -1488,7 +1488,7 @@ function Invoke-DownloadModuleFromWeb {
         Install the module inside of the provided directory into the defined destination
         and perform the following steps:
 
-        * Rename module if requestes by provided InstallWithModuleName
+        * Rename module if requested by provided InstallWithModuleName
         * If a ModuleHash is provided, check if it matches.
         * Add the destination path to the PSModulePath if necessary (depends on provided parameters)
         * Place the conventions-matching module folder in the destination folder
@@ -1796,9 +1796,9 @@ function Test-ModuleInstalledAndImport {
 
 <#
     .SYNOPSIS
-        Extract the content of the referenced zip file to the defind destination
+        Extract the content of the referenced zip file to the defined destination
 
-    .PARAMATER Path
+    .PARAMETER Path
         Path to a zip file with the file extension '.zip'
 
     .Parameter Destination
@@ -1856,7 +1856,7 @@ function Expand-ZipModule {
 
 <#
     .SYNOPSIS
-        Update '$env:PSModulePath' from 'User' and 'Machine' scope envrionment variables
+        Update '$env:PSModulePath' from 'User' and 'Machine' scope environment variables
 #>
 function Update-PSModulePath {
     process {

vendor/sources.json

@@ -1,22 +1,22 @@
 [
   {
     "name": "git-for-windows",
-        "version": "v2.26.2.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-64-bit.7z.exe"
+    "version": "2.38.0.windows.1",
+    "url": "https://github.com/git-for-windows/git/releases/download/v2.38.0.windows.1/PortableGit-2.38.0-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.3.47",
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.3.47/clink.1.3.47.d5796b.zip"
   },
   {
     "name": "conemu-maximus5",
-        "version": "191012",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v19.10.12/ConEmuPack.191012.7z"
+    "version": "22.08.07",
+    "url": "https://github.com/Maximus5/ConEmu/releases/download/v22.08.07/ConEmuPack.220807.7z"
   },
   {
     "name": "clink-completions",
-        "version": "0.3.5",
-        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.5.zip"
+    "version": "0.4.1",
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.4.1.zip"
   }
 ]

vendor/user_aliases.cmd.default

@@ -9,7 +9,7 @@ gl=git log --oneline --all --graph --decorate  $*
 ls=ls --show-control-chars -F --color $*
 pwd=cd
 clear=cls
-history=cat -n "%CMDER_ROOT%\config\.history"
 unalias=alias /d $1
 vi=vim $*
 cmderr=cd /d "%CMDER_ROOT%"
+pwsh=%SystemRoot%/System32/WindowsPowerShell/v1.0/powershell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command "Invoke-Expression '. ''%CMDER_ROOT%/vendor/profile.ps1'''"

vendor/user_profile.cmd.default

@@ -12,7 +12,7 @@
 :: set "PATH=%CMDER_ROOT%\vendor\whatever;%PATH%"
 
 :: arguments in this batch are passed from init.bat, you can quickly parse them like so:
-:: more useage can be seen by typing "cexec /?"
+:: more usage can be seen by typing "cexec /?"
 
 :: %ccall% "/customOption" "command/program"