Skip to content

Commit 25bc575

Browse files
authored
Merge pull request #2390 from daxgames/sysinfo
add systeminfo.exe output to cmder_diag.*
2 parents 44f5095 + 467b4d4 commit 25bc575

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

vendor/bin/cmder_diag.cmd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ echo where git
3535
echo ------------------------------------
3636
where git
3737

38+
echo.
39+
echo ------------------------------------
40+
echo systeminfo
41+
echo ------------------------------------
42+
systeminfo
43+
3844
echo.
3945
echo ------------------------------------
4046
echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!

vendor/bin/cmder_diag.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ write-host get-command git
3333
write-host ------------------------------------
3434
get-command git
3535

36+
write-host ''
37+
write-host ------------------------------------
38+
write-host systeminfo
39+
write-host ------------------------------------
40+
systeminfo
41+
3642
write-host ''
3743
write-host ------------------------------------
3844
write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!

vendor/bin/cmder_diag.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@ echo ''
3131
echo ------------------------------------
3232
echo which git
3333
echo ------------------------------------
34+
3435
which git
36+
echo ''
37+
echo ------------------------------------
38+
echo systeminfo
39+
echo ------------------------------------
40+
systeminfo
3541

3642
echo ''
3743
echo ------------------------------------

vendor/init.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ if defined GIT_INSTALL_ROOT (
199199
%lib_console% debug_output init.bat "Looking for Git install root..."
200200

201201
:: get the version information for vendored git binary
202-
%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
202+
%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd" 2>nul
203203
%lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%
204204

205205
:: check if git is in path...

vendor/lib/lib_git.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ exit /b
4848
)
4949

5050
:: get the git version in the provided directory
51-
5251
"%git_executable%" --version > "%temp%\git_version.txt"
5352
setlocal enabledelayedexpansion
5453
for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
@@ -272,7 +271,7 @@ exit /b
272271

273272
:get_user_git_version
274273
:: get the version information for the user provided git binary
275-
%lib_git% read_version USER "%test_dir%"
274+
%lib_git% read_version USER "%test_dir%" 2>nul
276275
%lib_git% validate_version USER %GIT_VERSION_USER%
277276
exit /b
278277

0 commit comments

Comments
 (0)