From 38fd3468fe35f9a44f710a925081eff6c8388089 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 7 Jul 2019 13:30:34 -0400 Subject: [PATCH 1/2] restore old alias.cmd without 'create' option --- vendor/bin/alias.cmd | 49 ++++++++++---------------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/vendor/bin/alias.cmd b/vendor/bin/alias.cmd index 999e5a0..ecf8878 100644 --- a/vendor/bin/alias.cmd +++ b/vendor/bin/alias.cmd @@ -48,28 +48,9 @@ goto parseargument doskey /macros | %WINDIR%\System32\findstr /b %currentarg%= && exit /b echo insufficient parameters. goto :p_help - ) else if "%currentarg%" == "create" ( - set _x=%* - - set _x=!_x:^^=^^^^! - set action=create - if ["%_f%"] neq [""] ( - for /f "tokens=1,2,3,* usebackq" %%G in (`echo !_x!`) do ( - set _x=%%J - ) - ) else ( - for /f "tokens=1,2,* usebackq" %%G in (`echo !_x!`) do ( - set _x=%%H %%I - ) - ) ) else ( + :: handle quotes within command definition, e.g. quoted long file names set _x=%* - if ["%_f%"] neq [""] ( - set _x=!_x:^^=^^^^! - for /f "tokens=1,2,* usebackq" %%G in (`echo !_x!`) do ( - set _x=%%I - ) - ) ) ) @@ -88,26 +69,18 @@ if "%ALIASES%" neq "%CMDER_ROOT%\config\user_aliases.cmd" ( ) ) -:: create with multiple parameters -if [%action%] == [create] ( - for /f "tokens=1,* usebackq" %%G in (`echo !_x!`) do ( - set alias_name=%%G - set alias_value=%%H - ) -) else ( - :: validate alias - for /f "delims== tokens=1,* usebackq" %%G in (`echo "!_x!"`) do ( - set alias_name=%%G - set alias_value=%%H - ) - - :: leading quotes added while validating - set alias_name=!alias_name:~1! - - :: trailing quotes added while validating - set alias_value=!alias_value:~0,-1! +:: validate alias +for /f "delims== tokens=1,* usebackq" %%G in (`echo "!_x!"`) do ( + set alias_name=%%G + set alias_value=%%H ) +:: leading quotes added while validating +set alias_name=!alias_name:~1! + +:: trailing quotes added while validating +set alias_value=!alias_value:~0,-1! + ::remove spaces set _temp=%alias_name: =% From b58b3b45475f89e67c6b699a908b2ee88f0819e4 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 7 Jul 2019 13:52:34 -0400 Subject: [PATCH 2/2] restore old alias.cmd without 'create' option --- vendor/bin/alias.cmd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vendor/bin/alias.cmd b/vendor/bin/alias.cmd index be9ee37..ccac5df 100644 --- a/vendor/bin/alias.cmd +++ b/vendor/bin/alias.cmd @@ -119,10 +119,6 @@ echo.Usage: echo. echo. alias [options] [alias=alias command] echo. -echo OR -echo. -echo. alias create [alias] [alias command] -echo. echo.Options: echo. echo. Note: Options MUST precede the alias definition.