From f1665ddd7df3d8f0f1f26adf57beacde05217100 Mon Sep 17 00:00:00 2001 From: Abhishek Aryan <22198661+Lunchb0ne@users.noreply.github.com> Date: Mon, 10 May 2021 18:47:17 +0300 Subject: [PATCH 1/5] Fix no env in the prompt string Yeah, I was surprised too.. --- vendor/clink.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/clink.lua b/vendor/clink.lua index 3c4ee42..f7b5056 100644 --- a/vendor/clink.lua +++ b/vendor/clink.lua @@ -129,7 +129,7 @@ local function set_prompt_filter() if env ~= nil then env = "("..env..") " else env = "" end - prompt = get_uah_color() .. "{uah}" .. get_cwd_color() .. "{cwd}{git}{hg}{svn}" .. get_lamb_color() .. cr .. "{lamb} \x1b[0m" + prompt = get_uah_color() .. "{uah}" .. get_cwd_color() .. "{cwd}{git}{hg}{svn}" .. 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) From 2ef8c967d2dd203869c411ca56bddfad6d505855 Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Thu, 19 Aug 2021 11:47:47 -0400 Subject: [PATCH 2/5] update conemu and clink (#2575) * update conemu and clink * update clink to 1.2.24 * update clink to 1.2.24 * update clink to 1.2.24 * Clink 1.2.26 Co-authored-by: dgames --- .gitignore | 1 + CHANGELOG.md | 3 ++- vendor/git-for-windows_1.29.1 | 1 + vendor/sources.json | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 120000 vendor/git-for-windows_1.29.1 diff --git a/.gitignore b/.gitignore index 67678bb..771fd1a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ vendor/*/* !vendor/lib/* !vendor/* !vendor/psmodules/* +vendor/git-for-windows config/* !config/Readme.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 77d2fdb..26aeaf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ ### Changes - Update Git for Windows to 2.31.1 -- Update to Clink 1.2.5 +- Update to Clink 1.2.26 +- Update to Conemu 210718 - Do not rely on having a `%cmder_root%\config\cmder_prompt_config.lua` ### Adds diff --git a/vendor/git-for-windows_1.29.1 b/vendor/git-for-windows_1.29.1 new file mode 120000 index 0000000..5f898e1 --- /dev/null +++ b/vendor/git-for-windows_1.29.1 @@ -0,0 +1 @@ +../../../dtgam/bin/git-2.29.0 \ No newline at end of file diff --git a/vendor/sources.json b/vendor/sources.json index d7fd186..b7f55a2 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -6,13 +6,13 @@ }, { "name": "clink", - "version": "1.2.22", - "url": "https://github.com/chrisant996/clink/releases/download/v1.2.22/clink.1.2.22.890a84.zip" + "version": "1.2.26", + "url": "https://github.com/chrisant996/clink/releases/download/v1.2.26/clink.1.2.26.3dc58b.zip" }, { "name": "conemu-maximus5", - "version": "210304", - "url": "https://github.com/Maximus5/ConEmu/releases/download/v21.03.04/ConEmuPack.210304.7z" + "version": "210718", + "url": "https://github.com/Maximus5/ConEmu/releases/download/v21.07.18/ConEmuPack.210718.7z" }, { "name": "clink-completions", From 6d1e2d6e8bc67481f29fde9ee5928dfcd5e67ecf Mon Sep 17 00:00:00 2001 From: Aleksandar Kocic Date: Tue, 31 Aug 2021 08:40:46 +0200 Subject: [PATCH 3/5] Fix Posh-Git 1.0.0 import and console. --- vendor/psmodules/Cmder.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vendor/psmodules/Cmder.ps1 b/vendor/psmodules/Cmder.ps1 index 755d4a7..59eae1e 100644 --- a/vendor/psmodules/Cmder.ps1 +++ b/vendor/psmodules/Cmder.ps1 @@ -21,6 +21,10 @@ function Import-Git(){ 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." } From f809af1eec2280e5ed6de7f195ed00bd6e6862da Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Fri, 17 Sep 2021 12:22:25 -0400 Subject: [PATCH 4/5] save cmder_diag.* output to a file --- vendor/bin/cmder_diag.cmd | 50 +++++++++++++-------- vendor/bin/cmder_diag.ps1 | 95 +++++++++++++++++++++++---------------- vendor/bin/cmder_diag.sh | 66 ++++++++++++++++----------- 3 files changed, 130 insertions(+), 81 deletions(-) diff --git a/vendor/bin/cmder_diag.cmd b/vendor/bin/cmder_diag.cmd index 66f41a1..f526cff 100644 --- a/vendor/bin/cmder_diag.cmd +++ b/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,25 +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 systeminfo -echo ------------------------------------ -systeminfo - echo. echo ------------------------------------ echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team! echo ------------------------------------ +) > "%temp%\cmder_diag_cmd.log" + +type "%temp%\cmder_diag_cmd.log" + +echo. +echo Above output was saved in "%temp%\cmder_diag_cmd.log" + + diff --git a/vendor/bin/cmder_diag.ps1 b/vendor/bin/cmder_diag.ps1 index f6ff930..45cb4b9 100644 --- a/vendor/bin/cmder_diag.ps1 +++ b/vendor/bin/cmder_diag.ps1 @@ -1,45 +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 systeminfo -write-host ------------------------------------ -systeminfo +"" +"------------------------------------" +"get-childitem '$env:CMDER_ROOT/vendor'" +"------------------------------------" +get-childitem "$env:CMDER_ROOT/vendor" |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 -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" diff --git a/vendor/bin/cmder_diag.sh b/vendor/bin/cmder_diag.sh index fa49445..993c366 100644 --- a/vendor/bin/cmder_diag.sh +++ b/vendor/bin/cmder_diag.sh @@ -1,45 +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 2>&1 + +echo '' +echo ------------------------------------ +echo which clink +echo ------------------------------------ +which clink 2>&1 -which git echo '' echo ------------------------------------ echo systeminfo echo ------------------------------------ -systeminfo +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" From fc6cf025bea350f0f5dfbdfb2515b643d9f44eb4 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Fri, 17 Sep 2021 12:28:49 -0400 Subject: [PATCH 5/5] save cmder_diag.* output to a file --- vendor/bin/cmder_diag.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vendor/bin/cmder_diag.ps1 b/vendor/bin/cmder_diag.ps1 index 45cb4b9..e4ddb16 100644 --- a/vendor/bin/cmder_diag.ps1 +++ b/vendor/bin/cmder_diag.ps1 @@ -1,5 +1,5 @@ -if (test-path $env:temp/cmder_diag_ps.log) { - remove-item $env:temp/cmder_diag_ps.log +if (test-path $env:temp\cmder_diag_ps.log) { + remove-item $env:temp\cmder_diag_ps.log } $cmder_diag = { @@ -56,9 +56,9 @@ get-childitem -s "$env:CMDER_ROOT/config" |ft LastWriteTime,mode,length,FullName "------------------------------------" } -& $cmder_diag | out-file -filePath $env:temp/cmder_diag_ps.log +& $cmder_diag | out-file -filePath $env:temp\cmder_diag_ps.log -get-content "$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" +write-host Above output was saved in "$env:temp\cmder_diag_ps.log"