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

CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Changes
 
 - Update Git for Windows to 2.31.1
+- Update to Clink 1.2.5
+- Do not rely on having a `%cmder_root%\config\cmder_prompt_config.lua`
 
 ### Adds
 

vendor/clink.lua

@@ -13,6 +13,34 @@ dofile(clink_lua_file)
 
 -- now add our own things...
 
+
+local function get_uah_color()
+  return uah_color or "\x1b[1;33;40m" -- Green = uah = [user]@[hostname]
+end
+
+local function get_cwd_color()
+  return cwd_color or "\x1b[1;32;40m" -- Yellow cwd = Current Working Directory
+end
+
+local function get_lamb_color()
+  return lamb_color or "\x1b[1;30;40m" -- Light Grey = Lambda Color
+end
+
+
+local function get_clean_color()
+  return clean_color or "\x1b[1;37;40m"
+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
+
 ---
 -- Makes a string safe to use as the replacement in string.gsub
 ---
@@ -65,6 +93,22 @@ local function set_prompt_filter()
       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_type == 'folder' then
         cwd = get_folder_name(cwd)
     end
@@ -83,14 +127,13 @@ local function set_prompt_filter()
       cr = ' '
     end
 
-    if env ~= nil then
-        prompt_lambSymbol = "("..env..") "..prompt_lambSymbol
-    end
+    if env ~= nil then env = "("..env..") " else env = "" end
 
-    prompt = uah_color .. "{uah}" .. cwd_color .. "{cwd}{git}{hg}{svn}" .. lamb_color .. cr .. "{lamb} \x1b[0m"
-    uah_value = string.gsub(prompt, "{uah}", uah)
-    new_value = string.gsub(uah_value, "{cwd}", cwd)
-    clink.prompt.value = string.gsub(new_value, "{lamb}", prompt_lambSymbol)
+    prompt = get_uah_color() .. "{uah}" .. get_cwd_color() .. "{cwd}{git}{hg}{svn}" .. get_lamb_color() .. cr .. "{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()
@@ -347,10 +390,9 @@ local function git_prompt_filter()
 
     -- Colors for git status
     local colors = {
-        clean = clean_color,
-        dirty = dirty_color,
-        conflict = conflict_color
-        nostatus = unknown_color
+        clean = get_clean_color(),
+        dirty = get_dirty_color(),
+        conflict = get_conflict_color()
     }
 
     local git_dir = get_git_dir()
@@ -404,9 +446,14 @@ local function hg_prompt_filter()
     if hg_dir then
         -- Colors for mercurial status
         local colors = {
+<<<<<<< HEAD
             clean = clean_color,
             dirty = dirty_color,
             nostatus = nostatus_color
+=======
+            clean = get_clean_color(),
+            dirty = get_dirty_color(),
+>>>>>>> 36f4ce0e3c664b23c3652f180b29e9238860b203
         }
 
         local pipe = io.popen("hg branch 2>&1")
@@ -439,9 +486,14 @@ end
 local function svn_prompt_filter()
     -- Colors for svn status
     local colors = {
+<<<<<<< HEAD
         clean = clean_color,
         dirty = dirty_color,
         nostatus = nostatus_color
+=======
+        clean = get_clean_color(),
+        dirty = get_dirty_color(),
+>>>>>>> 36f4ce0e3c664b23c3652f180b29e9238860b203
     }
 
     if get_svn_dir() then

vendor/sources.json

@@ -6,8 +6,8 @@
     },
     {
         "name": "clink",
-        "version": "1.1.45",
-        "url": "https://github.com/chrisant996/clink/releases/download/v1.1.45/clink.1.1.45.1c3985.zip"
+        "version": "1.2.5",
+        "url": "https://github.com/chrisant996/clink/releases/download/v1.2.5/clink.1.2.5.5dd017.zip"
     },
     {
         "name": "conemu-maximus5",