Commit9c9eac1

authored

Merge pull request#2449 from daxgames/alias_fix

Alias fix

2 parentse0b8ebc +ae0b772 commit9c9eac1Copy full SHA for 9c9eac1

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`#Change Log`
`2`	`2`
`3`		`-##[Unreleased]`
	`3`	`+##[1.3.17](https://github.com/cmderdev/cmder/tree/v1.3.17) (2020-12-23)`
`4`	`4`
`5`	`5`	`###Fixes`
`6`	`6`
	`7`	+-[bug] Running`alias ..=cd ..` removes other aliases#2394
`7`	`8`	`- Switch to@chrisant996[Clink](https://github.com/chrisant996/clink/) v1.1.10 to fix Clink newer Windows 10 releases.`
`8`	`9`	- Fix`\Git\cmd\git.exe found. was unexpected at this time.`
`9`	`10`	`- Documentation fixes.`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,9 @@ set alias_name=!alias_name:~1!`
`81`	`81`	`:: trailing quotes added while validating`
`82`	`82`	`setalias_value=!alias_value:~0,-1!`
`83`	`83`
	`84`	`+:: '.' escaped`
	`85`	`+setalias_name_esc=!alias_name:.=\.!`
	`86`	`+`
`84`	`87`	`::remove spaces`
`85`	`88`	`set_temp=%alias_name:=%`
`86`	`89`
`@@ -91,15 +94,19 @@ if not ["%_temp%"] == ["%alias_name%"] (`
`91`	`94`	`)`
`92`	`95`
`93`	`96`	`:: replace already defined alias`
`94`		`-%WINDIR%\System32\findstr /b /v /i"%alias_name%=""%ALIASES%">>"%ALIASES%.tmp"`
	`97`	`+%WINDIR%\System32\findstr /v /i"^%alias_name_esc%=""%ALIASES%">>"%ALIASES%.tmp"`
`95`	`98`	`echo%alias_name%=%alias_value%>>"%ALIASES%.tmp"&&type"%ALIASES%.tmp">"%ALIASES%"&@del /f /q"%ALIASES%.tmp"`
`96`	`99`	`doskey /macrofile="%ALIASES%"`
`97`	`100`	`endlocal`
`98`	`101`	`exit /b`
`99`	`102`
`100`	`103`	`:p_del`
`101`	`104`	`setdel_alias=%~1`
`102`		`-%WINDIR%\System32\findstr /b /v /i"%del_alias%=""%ALIASES%">>"%ALIASES%.tmp"`
	`105`	`+`
	`106`	`+:: '.' escaped`
	`107`	`+setdel_alias_esc=!del_alias:.=\.!`
	`108`	`+`
	`109`	`+%WINDIR%\System32\findstr /v /i"^%del_alias_esc%=""%ALIASES%">>"%ALIASES%.tmp"`
`103`	`110`	`type"%ALIASES%".tmp>"%ALIASES%"&@del /f /q"%ALIASES%.tmp"`
`104`	`111`	`doskey%del_alias%=`
`105`	`112`	`doskey /macrofile="%ALIASES%"`

Comments

(0)