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

This commit is contained in:
dgames 2020-12-24 12:15:08 -05:00
commit c4fb7e6034
2 changed files with 11 additions and 3 deletions

View File

@ -1,9 +1,10 @@
# Change Log
## [Unreleased]
## [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.

11
vendor/bin/alias.cmd vendored
View File

@ -81,6 +81,9 @@ set alias_name=!alias_name:~1!
:: trailing quotes added while validating
set alias_value=!alias_value:~0,-1!
:: '.' escaped
set alias_name_esc=!alias_name:.=\.!
::remove spaces
set _temp=%alias_name: =%
@ -91,7 +94,7 @@ if not ["%_temp%"] == ["%alias_name%"] (
)
:: replace already defined alias
%WINDIR%\System32\findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
%WINDIR%\System32\findstr /v /i "^%alias_name_esc%=" "%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 +102,11 @@ exit /b
:p_del
set del_alias=%~1
%WINDIR%\System32\findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
:: '.' escaped
set del_alias_esc=!del_alias:.=\.!
%WINDIR%\System32\findstr /v /i "^%del_alias_esc%=" "%ALIASES%" >> "%ALIASES%.tmp"
type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
doskey %del_alias%=
doskey /macrofile="%ALIASES%"