Merge branch 'master' of https://github.com/cmderdev/cmder into fix_configurable_prompt

This commit is contained in:
Dax T. Games 2021-05-02 21:04:23 -04:00
commit 6d79ed5eb2
2 changed files with 6 additions and 7 deletions

11
vendor/clink.lua vendored
View File

@ -127,14 +127,13 @@ local function set_prompt_filter()
cr = ' ' cr = ' '
end end
if env ~= nil then if env ~= nil then env = "("..env..") " else env = "" end
prompt_lambSymbol = "("..env..") "..prompt_lambSymbol
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 .. "{lamb} \x1b[0m"
uah_value = string.gsub(prompt, "{uah}", uah) prompt = string.gsub(prompt, "{uah}", uah)
new_value = string.gsub(uah_value, "{cwd}", cwd) prompt = string.gsub(prompt, "{cwd}", cwd)
clink.prompt.value = string.gsub(new_value, "{lamb}", prompt_lambSymbol) prompt = string.gsub(prompt, "{env}", env)
clink.prompt.value = string.gsub(prompt, "{lamb}", prompt_lambSymbol)
end end
local function percent_prompt_filter() local function percent_prompt_filter()

2
vendor/sources.json vendored
View File

@ -7,7 +7,7 @@
{ {
"name": "clink", "name": "clink",
"version": "1.2.5", "version": "1.2.5",
"url": "https://github.com/chrisant996/clink/releases/download/v1.1.45/clink.1.2.5.5dd017.zip" "url": "https://github.com/chrisant996/clink/releases/download/v1.2.55/clink.1.2.5.5dd017.zip"
}, },
{ {
"name": "conemu-maximus5", "name": "conemu-maximus5",