Merge pull request #2390 from daxgames/sysinfo

add systeminfo.exe output to cmder_diag.*
This commit is contained in:
Dax T Games 2020-12-11 05:42:22 -05:00 committed by GitHub
commit 25bc575e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 3 deletions

View File

@ -35,6 +35,12 @@ echo where git
echo ------------------------------------
where git
echo.
echo ------------------------------------
echo systeminfo
echo ------------------------------------
systeminfo
echo.
echo ------------------------------------
echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!

View File

@ -33,6 +33,12 @@ write-host get-command git
write-host ------------------------------------
get-command git
write-host ''
write-host ------------------------------------
write-host systeminfo
write-host ------------------------------------
systeminfo
write-host ''
write-host ------------------------------------
write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!

View File

@ -31,7 +31,13 @@ echo ''
echo ------------------------------------
echo which git
echo ------------------------------------
which git
echo ''
echo ------------------------------------
echo systeminfo
echo ------------------------------------
systeminfo
echo ''
echo ------------------------------------

2
vendor/init.bat vendored
View File

@ -199,7 +199,7 @@ if defined GIT_INSTALL_ROOT (
%lib_console% debug_output init.bat "Looking for Git install root..."
:: get the version information for vendored git binary
%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd" 2>nul
%lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%
:: check if git is in path...

View File

@ -48,7 +48,6 @@ exit /b
)
:: get the git version in the provided directory
"%git_executable%" --version > "%temp%\git_version.txt"
setlocal enabledelayedexpansion
for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
@ -272,7 +271,7 @@ exit /b
:get_user_git_version
:: get the version information for the user provided git binary
%lib_git% read_version USER "%test_dir%"
%lib_git% read_version USER "%test_dir%" 2>nul
%lib_git% validate_version USER %GIT_VERSION_USER%
exit /b