From 8f59d529f4350d9167fd2cce6817d0a0bc32f784 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Thu, 20 Jun 2019 10:12:12 +0100 Subject: [PATCH 1/6] Update stale comments --- .github/stale.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index c3b0200..30fb6b0 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -10,9 +10,10 @@ staleLabel: "👀 Awaiting Response" # Comment to post when marking an issue as stale. Set to `false` to disable markComment: > This issue has been automatically marked as stale because it has not had - recent activity. It will be closed in a week if no further activity occurs. - Thank you for your contribution. + any recent activity. It will be closed in a week if no further activity occurs. + Thank you for your contribution(s). # Comment to post when closing a stale issue. Set to `false` to disable closeComment: > This issue has been automatically closed due to it not having any - activity since it was marked as stale. Thank you for your contribution. + activity since it was marked as stale. + Thank you for your contribution(s). From b61752f89e7ce1cd13786f413f3eeec70b841dd7 Mon Sep 17 00:00:00 2001 From: SupinePandora43 <36124472+SupinePandora43@users.noreply.github.com> Date: Tue, 25 Jun 2019 12:37:57 +0400 Subject: [PATCH 2/6] vscode.bat add that to settings.json `"terminal.integrated.shell.windows": "cmd.exe", "terminal.integrated.shellArgs.windows": [ "/K", "%CMDER_ROOT%/vscode.bat", ]` for using cmder inside vscode --- vscode.bat | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 vscode.bat diff --git a/vscode.bat b/vscode.bat new file mode 100644 index 0000000..77fd534 --- /dev/null +++ b/vscode.bat @@ -0,0 +1,9 @@ +@echo off +IF [%1] == [] ( + REM -- manually opened console (Ctrl + Shift + `) -- + CALL "%~dp0\vendor\init.bat" +) ELSE ( + REM -- task -- + CALL cmd %* + exit +) From 72dd8376cd6ac8444d7202f3686fc06c64d1d943 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Thu, 27 Jun 2019 16:00:55 +0500 Subject: [PATCH 3/6] move https://github.com/cmderdev/cmder/pull/2113#issuecomment-506044156 --- vscode.bat => vendor/bin/vscode_init.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename vscode.bat => vendor/bin/vscode_init.cmd (80%) diff --git a/vscode.bat b/vendor/bin/vscode_init.cmd similarity index 80% rename from vscode.bat rename to vendor/bin/vscode_init.cmd index 77fd534..f95dc66 100644 --- a/vscode.bat +++ b/vendor/bin/vscode_init.cmd @@ -1,7 +1,7 @@ @echo off IF [%1] == [] ( REM -- manually opened console (Ctrl + Shift + `) -- - CALL "%~dp0\vendor\init.bat" + CALL "%~dp0..\init.bat" ) ELSE ( REM -- task -- CALL cmd %* From 38fd3468fe35f9a44f710a925081eff6c8388089 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 7 Jul 2019 13:30:34 -0400 Subject: [PATCH 4/6] 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 5/6] 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. From f8e859f844dfbc2fb4a5cef5fd265de258af4366 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 7 Jul 2019 14:05:14 -0400 Subject: [PATCH 6/6] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7543a5a..97759c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ ### Fixes +* Pull Request: [#2122](https://github.com/cmderdev/cmder/pull/2122) + * Restore old `alias.cmd` without `create` syntax because it did not work in all situations. +* Pull Request: [#2113](https://github.com/cmderdev/cmder/pull/2113) + * Add `vendor\bin\vscode_init.cmd` for use with Visual Studio Code + * Fixes [#2118](https://github.com/cmderdev/cmder/issues/2118) + * Fixes [#1985](https://github.com/cmderdev/cmder/issues/1985) * Pull Request: [#2106](https://github.com/cmderdev/cmder/pull/2106) * Portable Git requires running `post-install.bat` which deletes itself when done. This was not happening. * Resolves [#2105](https://github.com/cmderdev/cmder/issues/2105)