From da0af1d96b467431771f4d3a575f6253f774f370 Mon Sep 17 00:00:00 2001
From: dgames <dgames@dtg.local>
Date: Thu, 24 Dec 2020 12:14:46 -0500
Subject: [PATCH] 1.3.17 Fixes for clink settings and history

---
 vendor/init.bat                 | 6 ++++++
 vendor/sources.json             | 4 ++--
 vendor/user_aliases.cmd.default | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/vendor/init.bat b/vendor/init.bat
index 8f50b88..cb1a8e9 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -397,6 +397,12 @@ if "%CMDER_ALIASES%" == "1" if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMD
   echo   * Search for 'user-aliases' and replace it with 'user_aliases'.
 )
 
+alias history |find /i "cat" >nul
+if "%ERRORLEVEL%" == "0" (
+  echo Migrating alias 'history' to new Clink 1.x.x...
+  "%CMDER_ROOT%\vendor\bin\alias.cmd" history="^%%CMDER_ROOT^%%\vendor\clink\clink.bat" history
+)
+
 set initialConfig=
 
 :CMDER_CONFIGURED
diff --git a/vendor/sources.json b/vendor/sources.json
index 6996719..64eeb9f 100644
--- a/vendor/sources.json
+++ b/vendor/sources.json
@@ -6,8 +6,8 @@
     },
     {
         "name": "clink",
-        "version": "1.1.10",
-        "url": "https://github.com/chrisant996/clink/releases/download/v1.1.10/clink.1.1.10.125c9f.zip"
+        "version": "1.1.14",
+        "url": "https://github.com/chrisant996/clink/releases/download/v1.1.14/clink.1.1.14.a44ba3.zip"
     },
     {
         "name": "conemu-maximus5",
diff --git a/vendor/user_aliases.cmd.default b/vendor/user_aliases.cmd.default
index 4221684..7427eda 100644
--- a/vendor/user_aliases.cmd.default
+++ b/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"
+history="%cmder_root%\vendor\clink\clink.bat" history
 unalias=alias /d $1
 vi=vim $*
 cmderr=cd /d "%CMDER_ROOT%"