Skip to content

Commit

Permalink
Avoid using pause if Terminal is detected
Browse files Browse the repository at this point in the history
  • Loading branch information
WindowsAddict committed Aug 17, 2024
1 parent fb113c7 commit d55b9fa
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
17 changes: 15 additions & 2 deletions MAS/Separate-Files-Version/Check-Activation-Status.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,23 @@
:: 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\"
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 "ComSpec=%SysPath%\cmd.exe"
set "PSModulePath=%ProgramFiles%\WindowsPowerShell\Modules;%SysPath%\WindowsPowerShell\v1.0\Modules"

set "_psc=powershell -nop -c"
set "_err===== ERROR ===="
set _pwsh=1
Expand All @@ -29,8 +42,8 @@ setlocal EnableDelayedExpansion

:E_Exit
echo.
echo Press any key to exit.
pause >nul
echo Press 0 key to exit.
choice /c 0 /n
exit /b

:sppmgr:
Expand Down
13 changes: 11 additions & 2 deletions MAS/Separate-Files-Version/Troubleshoot.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -829,10 +829,14 @@ echo:
) else (
echo:
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..."
echo:
pause %nul1%
)
)

if defined uwp16 (
echo:
Expand Down Expand Up @@ -1042,8 +1046,13 @@ exit /b
echo:
echo %line%
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%
)
goto :at_menu

::========================================================================================================================================
Expand Down

0 comments on commit d55b9fa

Please sign in to comment.