@@ -55,16 +55,11 @@ echo.
5555
5656set " _ELEV_ARGS = /elevated"
5757if " %ST_DEBUG% " == " 1" set " _ELEV_ARGS = /elevated debug"
58- if " %ST_DEBUG% " == " 1" echo [%DATE% %TIME% ] Elevating: " %~f0 " %_ELEV_ARGS% >> " %LAUNCH_LOG% "
59- powershell -NoProfile -ExecutionPolicy Bypass -Command " Start-Process -FilePath '%~f0 ' -ArgumentList '%_ELEV_ARGS% ' -Verb RunAs -WorkingDirectory '%CD% ' -WindowStyle Normal"
60-
58+ powershell -NoProfile -ExecutionPolicy Bypass -Command " Start-Process -FilePath '%~f0 ' -ArgumentList '%_ELEV_ARGS% ' -Verb RunAs -WorkingDirectory '%~dp0 '"
6159if errorlevel 1 (
62- echo [ERROR] Failed to elevate. Run manually as administrator.
60+ echo [ERROR] Failed to elevate.
6361 pause
6462)
65- echo .
66- echo Press any key to close this window. The elevated window should now be open.
67- pause > nul
6863exit /b
6964
7065:ADMIN_CONFIRMED
@@ -121,9 +116,7 @@ if "%SCRIPT_PS1%"=="" (
121116
122117echo Using PowerShell script: %SCRIPT_PS1_NAME%
123118if " %ST_DEBUG% " == " 1" (
124- set " _EX = NO"
125- if exist " %SCRIPT_PS1% " set " _EX = YES"
126- >> " %LAUNCH_LOG% " echo [%DATE% %TIME% ] Using PS1: " %SCRIPT_PS1% " (exists: !_EX! )
119+ echo [%DATE% %TIME% ] Using PS1: " %SCRIPT_PS1% " ^ (exists: ^ < ^ %SCRIPT_PS1% ^^ ?^ ) >> " %LAUNCH_LOG% "
127120)
128121echo .
129122
@@ -194,8 +187,7 @@ echo.
194187pause
195188set " PS_EXTRA = "
196189if " %ST_DEBUG% " == " 1" set " PS_EXTRA = -NoExit"
197- if " %ST_DEBUG% " == " 1" echo [%DATE% %TIME% ] Launching PS interactive: powershell -NoProfile -ExecutionPolicy Bypass %PS_EXTRA% -File " %SCRIPT_PS1% " >> " %LAUNCH_LOG% "
198- powershell -NoProfile -ExecutionPolicy Bypass %PS_EXTRA% -File " %SCRIPT_PS1% "
190+ powershell.exe -NoProfile -ExecutionPolicy Bypass %PS_EXTRA% -File " %SCRIPT_PS1% "
199191echo .
200192if errorlevel 1 (
201193 echo [ERROR] Script failed (code: %errorlevel% )
@@ -219,8 +211,7 @@ pause
219211echo .
220212set " PS_EXTRA = "
221213if " %ST_DEBUG% " == " 1" set " PS_EXTRA = -NoExit"
222- if " %ST_DEBUG% " == " 1" echo [%DATE% %TIME% ] Launching PS autorun: powershell -NoProfile -ExecutionPolicy Bypass %PS_EXTRA% -File " %SCRIPT_PS1% " -AutoRun >> " %LAUNCH_LOG% "
223- powershell -NoProfile -ExecutionPolicy Bypass %PS_EXTRA% -File " %SCRIPT_PS1% " -AutoRun
214+ powershell.exe -NoProfile -ExecutionPolicy Bypass %PS_EXTRA% -File " %SCRIPT_PS1% " -AutoRun
224215echo .
225216if errorlevel 1 (
226217 echo [ERROR] Tests failed (code: %errorlevel% )
@@ -739,16 +730,4 @@ echo - SystemTest_Detailed_*.txt (full output)
739730echo - energy-report.html (if power test ran)
740731echo .
741732pause
742- exit /b 0
743- if not exist " %SCRIPT_PS1% " (
744- echo [ERROR] PowerShell script not found at: %SCRIPT_PS1%
745- if " %ST_DEBUG% " == " 1" >> " %LAUNCH_LOG% " echo [%DATE% %TIME% ] ERROR: PS1 missing at " %SCRIPT_PS1% "
746- pause
747- goto MENU
748- )
749- if not exist " %SCRIPT_PS1% " (
750- echo [ERROR] PowerShell script not found at: %SCRIPT_PS1%
751- if " %ST_DEBUG% " == " 1" >> " %LAUNCH_LOG% " echo [%DATE% %TIME% ] ERROR: PS1 missing at " %SCRIPT_PS1% "
752- pause
753- goto MENU
754- )
733+ exit /b 0
0 commit comments