1 files changed, 11 insertions, 36 deletions
diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index 75a9b98..4935b0f 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -63,7 +63,7 @@ exit /b
 ::========================================================================================================================================
 
 set "blank="
-set "mas=mass%blank%grave.dev"
+set "mas=ht%blank%tps%blank%://mass%blank%grave.dev/"
 
 ::  Check if Null service is working, it's important for the batch script
 
@@ -73,7 +73,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - https://%mas%/troubleshoot.html
+echo Help - %mas%troubleshoot.html
 echo:
 echo:
 ping 127.0.0.1 -n 10
@@ -295,7 +295,7 @@ echo Evaluation Editions cannot be activated.
 echo You need to install full version of %winos%
 echo:
 echo Download it from here,
-echo https://%mas%/genuine-installation-media.html
+echo %mas%genuine-installation-media.html
 goto dk_done
 )
 )
@@ -450,7 +450,7 @@ if not defined key (
 echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
 echo Unable to find this product in the supported product list.
 echo Make sure you are using updated version of the script.
-echo https://%mas%
+echo %mas%
 echo:
 goto dk_done
 )
@@ -625,7 +625,7 @@ if defined resfail (
 set error=1
 echo:
 call :dk_color %Red% "Checking Licensing Servers              [Failed To Connect]"
-call :dk_color2 %Blue% "Check this page for help" %_Yellow% " https://%mas%/licensing-servers-issue"
+call :dk_color2 %Blue% "Check this page for help" %_Yellow% " %mas%licensing-servers-issue"
 )
 )
 
@@ -658,7 +658,7 @@ echo "%error_code%" | findstr /i "0x80072e 0x80072f" %nul% && (
 set error=1
 echo:
 call :dk_color %Red% "Checking Internet Issues                [Found] [%error_code%]"
-call :dk_color2 %Blue% "Check this page for help" %_Yellow% " https://%mas%/licensing-servers-issue"
+call :dk_color2 %Blue% "Check this page for help" %_Yellow% " %mas%licensing-servers-issue"
 )
 )
 
@@ -673,8 +673,9 @@ if defined notworking (
 call :dk_color %Blue% "At the time of writing this, HWID Activation was not supported for this product."
 call :dk_color %Blue% "Use KMS38 Activation option."
 ) else (
-if not defined error call :dk_color %Blue% "%_fixmsg%"
-call :dk_color2 %Blue% "Check this page for help" %_Yellow% " https://%mas%/troubleshoot"
+call :dk_color %Blue% "HWID Activation is not working. Use KMS38 Activation option for now."
+REM if not defined error call :dk_color %Blue% "%_fixmsg%"
+call :dk_color2 %_White% "Check this page for help" %_White% " %mas%troubleshoot"
 )
 )
 
@@ -756,19 +757,6 @@ $guidsString = $guids -join " "
 $guidsString
 :getactivationid:
 
-::  Get SvcRestartTask info
-
-:gettaskinfo:
-$task = Get-ScheduledTask | Where-Object { $_.TaskName -eq 'SvcRestartTask' -and $_.TaskPath -eq '\Microsoft\Windows\SoftwareProtectionPlatform\' }
-$info = $task | Get-ScheduledTaskInfo
-if ($info.LastRunTime -match 99) {
-$task | Start-ScheduledTask
-Start-Sleep -Seconds 3
-$info = $task | Get-ScheduledTaskInfo
-}
-"$($task.State) $($info.LastTaskResult) $($info.LastRunTime)"
-:gettaskinfo:
-
 ::  Check wmic.exe
 
 :dk_ckeckwmic
@@ -943,7 +931,7 @@ if /i %dism_error%==[0x800F0805] (
 for %%# in (4 125 126 188 191 205) do if "%osSKU%"=="%%#" (
 call :dk_color %Blue% "Evaluation Windows can not be activated and different License install may lead to errors."
 call :dk_color %Blue% "It is recommended to install full version of %winos%."
-call :dk_color %Blue% "You can download it from https://%mas%/genuine-installation-media.html"
+call :dk_color %Blue% "You can download it from %mas%genuine-installation-media.html"
 set showfix=1
 )
 )
@@ -1011,7 +999,7 @@ set error=1
 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (
 call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"
-call :dk_color %Blue% "Possibly Caused By Gaming Spoofers. Help: https://%mas%/troubleshoot"
+call :dk_color %Blue% "Possibly Caused By Gaming Spoofers. Help: %mas%troubleshoot"
 set error=1
 set showfix=1
 )
@@ -1059,19 +1047,6 @@ call :dk_color %Red% "Checking sppsvc.exe File                [Not Found]"
 )
 
 
-set task=
-set taskerror=
-if not defined wmifailed if not defined officeact (
-for /f "delims=" %%a in ('%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':gettaskinfo\:.*';iex ($f[1]);"') do (set task=%%a)
-echo "!task!" | find /i "Ready 0 " %nul% || set taskerror=1
-echo "!task!" | find "99" %nul% && set taskerror=1
-if defined taskerror (
-call :dk_color %Gray% "Checking SvcRestartTask Last Run        [Issues Found, !task!]"
-call :dk_color %Gray% "Windows may face issues in keeping activation. Help: https://%mas%/troubleshoot"
-)
-)
-
-
 ::  Below checks are performed if required services are not disabled or corrupted + if there is any error + slmgr /dlv errorlevel is not Zero + no fix was shown before
 
 set wpaerror=