Avoid using pause if Terminal is detected
This commit is contained in:
parent
fb113c7c24
commit
d55b9fa78c
|
@ -6,10 +6,23 @@
|
||||||
:: https://gravesoft.dev/cas
|
:: https://gravesoft.dev/cas
|
||||||
|
|
||||||
|
|
||||||
|
:: Set Environment variables, it helps if they are misconfigured in the system
|
||||||
|
|
||||||
|
setlocal EnableExtensions
|
||||||
|
setlocal DisableDelayedExpansion
|
||||||
|
|
||||||
|
set "PathExt=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC"
|
||||||
|
|
||||||
|
set "SysPath=%SystemRoot%\System32"
|
||||||
set "Path=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0\"
|
set "Path=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0\"
|
||||||
if exist "%SystemRoot%\Sysnative\reg.exe" (
|
if exist "%SystemRoot%\Sysnative\reg.exe" (
|
||||||
|
set "SysPath=%SystemRoot%\Sysnative"
|
||||||
set "Path=%SystemRoot%\Sysnative;%SystemRoot%;%SystemRoot%\Sysnative\Wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%Path%"
|
set "Path=%SystemRoot%\Sysnative;%SystemRoot%;%SystemRoot%\Sysnative\Wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%Path%"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set "ComSpec=%SysPath%\cmd.exe"
|
||||||
|
set "PSModulePath=%ProgramFiles%\WindowsPowerShell\Modules;%SysPath%\WindowsPowerShell\v1.0\Modules"
|
||||||
|
|
||||||
set "_psc=powershell -nop -c"
|
set "_psc=powershell -nop -c"
|
||||||
set "_err===== ERROR ===="
|
set "_err===== ERROR ===="
|
||||||
set _pwsh=1
|
set _pwsh=1
|
||||||
|
@ -29,8 +42,8 @@ setlocal EnableDelayedExpansion
|
||||||
|
|
||||||
:E_Exit
|
:E_Exit
|
||||||
echo.
|
echo.
|
||||||
echo Press any key to exit.
|
echo Press 0 key to exit.
|
||||||
pause >nul
|
choice /c 0 /n
|
||||||
exit /b
|
exit /b
|
||||||
|
|
||||||
:sppmgr:
|
:sppmgr:
|
||||||
|
|
|
@ -829,10 +829,14 @@ echo:
|
||||||
) else (
|
) else (
|
||||||
echo:
|
echo:
|
||||||
call :dk_color %_Yellow% "A Window will popup, in that Window you need to select [Quick] Repair Option..."
|
call :dk_color %_Yellow% "A Window will popup, in that Window you need to select [Quick] Repair Option..."
|
||||||
|
if defined terminal (
|
||||||
|
call :dk_color %_Yellow% "Press 0 key to continue..."
|
||||||
|
choice /c 0 /n
|
||||||
|
) else (
|
||||||
call :dk_color %_Yellow% "Press any key to continue..."
|
call :dk_color %_Yellow% "Press any key to continue..."
|
||||||
echo:
|
|
||||||
pause %nul1%
|
pause %nul1%
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
if defined uwp16 (
|
if defined uwp16 (
|
||||||
echo:
|
echo:
|
||||||
|
@ -1042,8 +1046,13 @@ exit /b
|
||||||
echo:
|
echo:
|
||||||
echo %line%
|
echo %line%
|
||||||
echo:
|
echo:
|
||||||
call :dk_color %_Yellow% "Press any key to go back..."
|
if defined terminal (
|
||||||
|
call :dk_color %_Yellow% "Press 0 key to %_exitmsg%..."
|
||||||
|
choice /c 0 /n
|
||||||
|
) else (
|
||||||
|
call :dk_color %_Yellow% "Press any key to %_exitmsg%..."
|
||||||
pause %nul1%
|
pause %nul1%
|
||||||
|
)
|
||||||
goto :at_menu
|
goto :at_menu
|
||||||
|
|
||||||
::========================================================================================================================================
|
::========================================================================================================================================
|
||||||
|
|
Loading…
Reference in New Issue