Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	bin/alias.bat
This commit is contained in:
Mike Sigsworth
2015-10-12 21:32:33 -06:00
24 changed files with 688 additions and 296 deletions

View File

@ -12,7 +12,11 @@ if ["%1"] == ["/?"] goto:p_help
if ["%1"] == ["/reload"] goto:p_reload
:: /d flag for delete existing alias
if ["%1"] == ["/d"] goto:p_del %*
if ["%2"] == [""] echo Insufficient parameters. & goto:p_help
:: if arg is an existing alias, display it
if ["%2"] == [""] (
doskey /macros | findstr /b %1= && goto:eof
echo Insufficient parameters. & goto:p_help
)
:: validate alias
for /f "delims== tokens=1" %%G in ("%_x%") do set alias=%%G