images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-03-13 06:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Dax T. Games 2019-04-01 22:10:21 -04:00
parent f20eca01ac
commit 528bbea7f5
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
vendor/bin/alias.cmd vendored
View File

@ -14,8 +14,6 @@ if "%~1" == "" echo Use /? for help & echo. & goto :p_show
rem #region parseargument rem #region parseargument
goto parseargument goto parseargument
set args=
:do_shift :do_shift
shift shift
@ -24,6 +22,7 @@ set args=
if /i "%currentarg%" equ "/f" ( if /i "%currentarg%" equ "/f" (
set ALIASES=%~2 set ALIASES=%~2
set _f=%~2
shift shift
goto :do_shift goto :do_shift
) else if /i "%currentarg%" == "/reload" ( ) else if /i "%currentarg%" == "/reload" (
@ -50,19 +49,27 @@ set args=
echo insufficient parameters. echo insufficient parameters.
goto :p_help goto :p_help
) else if "%currentarg%" == "create" ( ) else if "%currentarg%" == "create" (
set _x=%*
set _x=!_x:^^=^^^^!
set action=create set action=create
if ["%ALIASES%"] neq ["%CMDER_ROOT%\config\user_aliases.cmd"] ( if ["%_f%"] neq [""] (
for /f "tokens=1,2,3,* usebackq" %%G in (`echo %*`) do ( for /f "tokens=1,2,3,* usebackq" %%G in (`echo !_x!`) do (
set args=%%J set _x=%%J
) )
) else ( ) else (
for /f "tokens=1,2,* usebackq" %%G in (`echo %*`) do ( for /f "tokens=1,2,* usebackq" %%G in (`echo !_x!`) do (
set args=%%H %%I set _x=%%H %%I
) )
) )
) else ( ) else (
:: handle quotes within command definition, e.g. quoted long file names
set _x=%* set _x=%*
if ["%_f%"] neq [""] (
set _x=!_x:^^=^^^^!
for /f "tokens=1,2,* usebackq" %%G in (`echo !_x!`) do (
set _x=%%I
)
)
) )
) )
@ -81,20 +88,16 @@ if "%ALIASES%" neq "%CMDER_ROOT%\config\user_aliases.cmd" (
) )
) )
<<<<<<< HEAD
:: create with multiple parameters :: create with multiple parameters
if [%action%] == [create] ( if [%action%] == [create] (
if not ["%args%"] == [""] ( for /f "tokens=1,* usebackq" %%G in (`echo !_x!`) do (
for /f "tokens=1,* usebackq" %%G in (`echo %args%`) do ( set alias_name=%%G
set alias_name=%%G set alias_value=%%H
set alias_value=%%H
)
) )
) else ( ) else (
:: validate alias :: validate alias
echo %_x% rem set _x=!_x:%=^^%!
set x=!_x:%=^^%!
echo !_x!
for /f "delims== tokens=1,* usebackq" %%G in (`echo "!_x!"`) do ( for /f "delims== tokens=1,* usebackq" %%G in (`echo "!_x!"`) do (
set alias_name=%%G set alias_name=%%G
set alias_value=%%H set alias_value=%%H
@ -104,21 +107,9 @@ if [%action%] == [create] (
set alias_name=!alias_name:~1! set alias_name=!alias_name:~1!
:: trailing quotes added while validating :: trailing quotes added while validating
set alias_value=!alias_value:~1,-1! 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
>>>>>>> 67b374ad378bee1b9157b9a0b20c8e667ec6c6da
) )
:: 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 ::remove spaces
set _temp=%alias_name: =% set _temp=%alias_name: =%