Compare commits

..

No commits in common. "5e2cc4f5cf79d55f0302bffdb439544480b24d88" and "9c09432b01c4094c987edf333d86b247891c2cda" have entirely different histories.

10 changed files with 14 additions and 34 deletions

View File

@ -143,10 +143,10 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected; activation is not supported.
echo Windows Sandbox detected; activation is not required.
echo The script cannot run due to missing licensing components. Aborting...
echo:
goto dk_done
@ -4507,7 +4507,7 @@ echo Checking Internet Connection [Connected!ping_f!]
) else (
if /i %_actmethod%==Auto if not %_actman%==1 set tsmethod=KMS4k
if /i !tsmethod!==KMS4k (
call :dk_color %Red% "Checking Internet Connection [Not Connected]"
call :dk_color %Gray% "Checking Internet Connection [Not Connected]"
call :dk_color %Blue% "Switching To KMS4k activation because Internet is needed for StaticCID method."
) else (
set error=1
@ -5754,11 +5754,6 @@ if %_actman%==0 (if not defined error call :dk_color %Blue% "%_fixmsg%")
set fixes=%fixes% %mas%troubleshoot
call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
) else (
if /i %tsmethod%==KMS4k if %winbuild% GEQ 26200 (
echo:
call :dk_color %Gray% "In Windows settings, you may see a renewal notification for activation that can be ignored."
if /i %_actmethod%==Auto call :dk_color %Gray% "To avoid this notification, run the script with an internet connection to use the StaticCID method."
)
echo "%tsids%" | find /i "7e94be23-b161-4956-a682-146ab291774c" %nul1% && (
call :dk_color %Gray% "Windows Update can receive 1-3 years of ESU. 4-6 years ESU is not officially supported, but you can manually install updates."
)
@ -12402,11 +12397,6 @@ echo Removing the Added Specific KMS Host [Successful]
)
)
if defined _k38 if %winbuild% GEQ 26200 (
call :dk_color %Gray% "In Windows settings, you may see a renewal notification for activation that can be ignored."
call :dk_color %Gray% "To avoid this notification, please use the HWID or TSforge activation options in the main menu."
)
:: clipup.exe does not exist in server cor and acor editions by default, it was copied there with this script
if defined a_cor if exist "%_clipup%" del /f /q "%_clipup%" %nul%

View File

@ -173,10 +173,10 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected; activation is not supported.
echo Windows Sandbox detected; activation is not required.
echo The script cannot run due to missing licensing components. Aborting...
echo:
goto dk_done

View File

@ -175,7 +175,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected; activation is not required.
@ -837,11 +837,6 @@ echo Removing the Added Specific KMS Host [Successful]
)
)
if defined _k38 if %winbuild% GEQ 26200 (
call :dk_color %Gray% "In Windows settings, you may see a renewal notification for activation that can be ignored."
call :dk_color %Gray% "To avoid this notification, please use the HWID or TSforge activation options in the main menu."
)
:: clipup.exe does not exist in server cor and acor editions by default, it was copied there with this script
if defined a_cor if exist "%_clipup%" del /f /q "%_clipup%" %nul%

View File

@ -173,7 +173,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected; activation is not required.

View File

@ -204,7 +204,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected; activation is not required.

View File

@ -219,7 +219,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected; activation is not required.
@ -684,7 +684,7 @@ echo Checking Internet Connection [Connected!ping_f!]
) else (
if /i %_actmethod%==Auto if not %_actman%==1 set tsmethod=KMS4k
if /i !tsmethod!==KMS4k (
call :dk_color %Red% "Checking Internet Connection [Not Connected]"
call :dk_color %Gray% "Checking Internet Connection [Not Connected]"
call :dk_color %Blue% "Switching To KMS4k activation because Internet is needed for StaticCID method."
) else (
set error=1
@ -1931,11 +1931,6 @@ if %_actman%==0 (if not defined error call :dk_color %Blue% "%_fixmsg%")
set fixes=%fixes% %mas%troubleshoot
call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
) else (
if /i %tsmethod%==KMS4k if %winbuild% GEQ 26200 (
echo:
call :dk_color %Gray% "In Windows settings, you may see a renewal notification for activation that can be ignored."
if /i %_actmethod%==Auto call :dk_color %Gray% "To avoid this notification, run the script with an internet connection to use the StaticCID method."
)
echo "%tsids%" | find /i "7e94be23-b161-4956-a682-146ab291774c" %nul1% && (
call :dk_color %Gray% "Windows Update can receive 1-3 years of ESU. 4-6 years ESU is not officially supported, but you can manually install updates."
)

View File

@ -135,7 +135,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected.

View File

@ -140,7 +140,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected.

View File

@ -134,7 +134,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto done2
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected.

View File

@ -135,7 +135,7 @@ call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%trouble
goto dk_done
)
if exist "%Systemdrive%\Users\WDAGUtilityAccount" (
if not exist "%SysPath%\logoff.exe" (
sc query gcs | find /i "RUNNING" %nul% && (
%eline%
echo Windows Sandbox detected.