mirror of
https://github.com/cmderdev/cmder.git
synced 2024-11-10 17:59:11 +08:00
Merge pull request #2390 from daxgames/sysinfo
add systeminfo.exe output to cmder_diag.*
This commit is contained in:
commit
25bc575e8a
6
vendor/bin/cmder_diag.cmd
vendored
6
vendor/bin/cmder_diag.cmd
vendored
@ -35,6 +35,12 @@ echo where git
|
|||||||
echo ------------------------------------
|
echo ------------------------------------
|
||||||
where git
|
where git
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ------------------------------------
|
||||||
|
echo systeminfo
|
||||||
|
echo ------------------------------------
|
||||||
|
systeminfo
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ------------------------------------
|
echo ------------------------------------
|
||||||
echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
|
echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
|
||||||
|
6
vendor/bin/cmder_diag.ps1
vendored
6
vendor/bin/cmder_diag.ps1
vendored
@ -33,6 +33,12 @@ write-host get-command git
|
|||||||
write-host ------------------------------------
|
write-host ------------------------------------
|
||||||
get-command git
|
get-command git
|
||||||
|
|
||||||
|
write-host ''
|
||||||
|
write-host ------------------------------------
|
||||||
|
write-host systeminfo
|
||||||
|
write-host ------------------------------------
|
||||||
|
systeminfo
|
||||||
|
|
||||||
write-host ''
|
write-host ''
|
||||||
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!
|
write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
|
||||||
|
6
vendor/bin/cmder_diag.sh
vendored
6
vendor/bin/cmder_diag.sh
vendored
@ -31,7 +31,13 @@ echo ''
|
|||||||
echo ------------------------------------
|
echo ------------------------------------
|
||||||
echo which git
|
echo which git
|
||||||
echo ------------------------------------
|
echo ------------------------------------
|
||||||
|
|
||||||
which git
|
which git
|
||||||
|
echo ''
|
||||||
|
echo ------------------------------------
|
||||||
|
echo systeminfo
|
||||||
|
echo ------------------------------------
|
||||||
|
systeminfo
|
||||||
|
|
||||||
echo ''
|
echo ''
|
||||||
echo ------------------------------------
|
echo ------------------------------------
|
||||||
|
2
vendor/init.bat
vendored
2
vendor/init.bat
vendored
@ -199,7 +199,7 @@ if defined GIT_INSTALL_ROOT (
|
|||||||
%lib_console% debug_output init.bat "Looking for Git install root..."
|
%lib_console% debug_output init.bat "Looking for Git install root..."
|
||||||
|
|
||||||
:: get the version information for vendored git binary
|
:: 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%
|
%lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%
|
||||||
|
|
||||||
:: check if git is in path...
|
:: check if git is in path...
|
||||||
|
3
vendor/lib/lib_git.cmd
vendored
3
vendor/lib/lib_git.cmd
vendored
@ -48,7 +48,6 @@ exit /b
|
|||||||
)
|
)
|
||||||
|
|
||||||
:: get the git version in the provided directory
|
:: get the git version in the provided directory
|
||||||
|
|
||||||
"%git_executable%" --version > "%temp%\git_version.txt"
|
"%git_executable%" --version > "%temp%\git_version.txt"
|
||||||
setlocal enabledelayedexpansion
|
setlocal enabledelayedexpansion
|
||||||
for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
|
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_user_git_version
|
||||||
:: get the version information for the user provided git binary
|
:: 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%
|
%lib_git% validate_version USER %GIT_VERSION_USER%
|
||||||
exit /b
|
exit /b
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user