Better info when key is not found

MAS/All-In-One-Version-KL/MAS_AIO.cmd

@@ -3808,18 +3808,29 @@ call :dk_color %Red% "Checking Alternate Edition for KMS38    [%altedition% Acti
 )
 
 if not defined key if not defined _gvlk (
-%eline%
+echo:
 echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
-if not defined skunotfound (
-echo This product does not support KMS38 activation.
-echo Make sure you are using the latest version of the script.
-set fixes=%fixes% %mas%
-echo %mas%
-) else (
-echo Required license files were not found in %SysPath%\spp\tokens\skus\
+
+if exist "%SysPath%\spp\tokens\skus\%osedition%\*GVLK*.xrm-ms" set sppks=1
+
+if defined skunotfound (
+call :dk_color %Red% "Required license files not found in %SysPath%\spp\tokens\skus\"
 set fixes=%fixes% %mas%troubleshoot
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 )
+
+if defined sppks (
+call :dk_color %Red% "KMS38 activation is supported but failed to find the key."
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
+)
+
+if not defined skunotfound if not defined sppks (
+call :dk_color %Red% "This product does not support KMS38 activation."
+call :dk_color %Blue% "Make sure you are using the latest version of the script."
+set fixes=%fixes% %mas%
+echo %mas%
+)
 echo:
 goto dk_done
 )
@@ -4617,15 +4628,30 @@ call :dk_color %Red% "Checking Alternate Edition For %KS%      [%altedition% Act
 
 if not defined key if not defined _gvlk (
 echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
-if not defined skunotfound (
-echo This product does not support %KS% activation.
-set fixes=%fixes% %mas%unsupported_products_activation
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation"
-) else (
-echo Required license files not found in %SysPath%\spp\tokens\skus\
+
+if %winbuild% GEQ 9200 if exist "%SysPath%\spp\tokens\skus\%osedition%\*GVLK*.xrm-ms" set sppks=1
+if %winbuild% LSS 9200 if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*VLKMS*.xrm-ms" set sppks=1
+if %winbuild% LSS 9200 if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*VL-BYPASS*.xrm-ms" set sppks=1
+
+if defined skunotfound (
+call :dk_color %Red% "Required license files not found in %SysPath%\spp\tokens\skus\"
 set fixes=%fixes% %mas%troubleshoot
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 )
+
+if defined sppks (
+call :dk_color %Red% "%KS% activation is supported but failed to find the %KS% key."
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
+)
+
+if not defined skunotfound if not defined sppks (
+call :dk_color %Red% "This product does not support %KS% activation."
+if %winbuild% LSS 9200 (
+call :dk_color2 %Blue% "Use the alternative activator listed here - " %_Yellow% " %mas%unsupported_products_activation"
+)
+set fixes=%fixes% %mas%unsupported_products_activation
+)
 echo:
 goto :ks_office
 )

MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd

@@ -522,18 +522,29 @@ call :dk_color %Red% "Checking Alternate Edition for KMS38    [%altedition% Acti
 )
 
 if not defined key if not defined _gvlk (
-%eline%
+echo:
 echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
-if not defined skunotfound (
-echo This product does not support KMS38 activation.
-echo Make sure you are using the latest version of the script.
-set fixes=%fixes% %mas%
-echo %mas%
-) else (
-echo Required license files were not found in %SysPath%\spp\tokens\skus\
+
+if exist "%SysPath%\spp\tokens\skus\%osedition%\*GVLK*.xrm-ms" set sppks=1
+
+if defined skunotfound (
+call :dk_color %Red% "Required license files not found in %SysPath%\spp\tokens\skus\"
 set fixes=%fixes% %mas%troubleshoot
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 )
+
+if defined sppks (
+call :dk_color %Red% "KMS38 activation is supported but failed to find the key."
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
+)
+
+if not defined skunotfound if not defined sppks (
+call :dk_color %Red% "This product does not support KMS38 activation."
+call :dk_color %Blue% "Make sure you are using the latest version of the script."
+set fixes=%fixes% %mas%
+echo %mas%
+)
 echo:
 goto dk_done
 )

MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd

@@ -562,15 +562,30 @@ call :dk_color %Red% "Checking Alternate Edition For %KS%      [%altedition% Act
 
 if not defined key if not defined _gvlk (
 echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
-if not defined skunotfound (
-echo This product does not support %KS% activation.
-set fixes=%fixes% %mas%unsupported_products_activation
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation"
-) else (
-echo Required license files not found in %SysPath%\spp\tokens\skus\
+
+if %winbuild% GEQ 9200 if exist "%SysPath%\spp\tokens\skus\%osedition%\*GVLK*.xrm-ms" set sppks=1
+if %winbuild% LSS 9200 if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*VLKMS*.xrm-ms" set sppks=1
+if %winbuild% LSS 9200 if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*VL-BYPASS*.xrm-ms" set sppks=1
+
+if defined skunotfound (
+call :dk_color %Red% "Required license files not found in %SysPath%\spp\tokens\skus\"
 set fixes=%fixes% %mas%troubleshoot
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 )
+
+if defined sppks (
+call :dk_color %Red% "%KS% activation is supported but failed to find the %KS% key."
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
+)
+
+if not defined skunotfound if not defined sppks (
+call :dk_color %Red% "This product does not support %KS% activation."
+if %winbuild% LSS 9200 (
+call :dk_color2 %Blue% "Use the alternative activator listed here - " %_Yellow% " %mas%unsupported_products_activation"
+)
+set fixes=%fixes% %mas%unsupported_products_activation
+)
 echo:
 goto :ks_office
 )