Update README, don't relaunch if unattended mode found

11 files changed, 52 insertions, 27 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index c5e1bcf..b889bcd 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -44,6 +44,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

@@ -1984,7 +1985,7 @@ cmd /c exit /b %error_code%
 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

 

 if %error_code% NEQ 0 (

-call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] %error_code%"

+call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

 echo:

 call :dk_color %Blue% "%_fixmsg%"

diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
index a3a78f1..a1aad27 100644
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@@ -50,6 +50,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

@@ -1668,7 +1669,7 @@ cmd /c exit /b %error_code%
 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

 

 if %error_code% NEQ 0 (

-call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] %error_code%"

+call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

 echo:

 call :dk_color %Blue% "%_fixmsg%"

diff --git a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
index b0bede7..f49fe4f 100644
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@@ -50,6 +50,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

@@ -1753,7 +1754,7 @@ cmd /c exit /b %error_code%
 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

 

 if %error_code% NEQ 0 (

-call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] %error_code%"

+call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

 echo:

 call :dk_color %Blue% "%_fixmsg%"

diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
index 3b0e569..fd4cc38 100644
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@@ -50,6 +50,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

@@ -2354,7 +2355,7 @@ cmd /c exit /b %error_code%
 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

 

 if %error_code% NEQ 0 (

-call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] %error_code%"

+call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

 echo:

 call :dk_color %Blue% "%_fixmsg%"

diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
index 89a6c4d..807d076 100644
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@@ -75,6 +75,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

@@ -3417,7 +3418,7 @@ cmd /c exit /b %error_code%
 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

 

 if %error_code% NEQ 0 (

-call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] %error_code%"

+call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

 echo:

 call :dk_color %Blue% "%_fixmsg%"

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index db74494..bbb0d82 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -84,6 +84,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

@@ -3423,7 +3424,7 @@ cmd /c exit /b %error_code%
 if %error_code% NEQ 0 set "error_code=0x%=ExitCode%"

 

 if %error_code% NEQ 0 (

-call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] %error_code%"

+call :dk_color %Red% "Checking SoftwareLicensingService       [Not Working] [%error_code%]"

 if not defined showfix (

 echo:

 call :dk_color %Blue% "%_fixmsg%"

diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
index bfa942b..1971226 100644
--- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
@@ -37,6 +37,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
index 59fc287..6a12bea 100644
--- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
@@ -42,6 +42,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
index dcf9366..15a5159 100644
--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@@ -37,6 +37,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd
index 4bc20e8..2b778f2 100644
--- a/MAS/Separate-Files-Version/Troubleshoot.cmd
+++ b/MAS/Separate-Files-Version/Troubleshoot.cmd
@@ -37,6 +37,7 @@ set "_cmdf=%~f0"
 for %%# in (%*) do (

 if /i "%%#"=="re1" set re1=1

 if /i "%%#"=="re2" set re2=1

+if "%%#"=="/" (set re1=1&set re2=1)

 )

 

 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows

diff --git a/README.md b/README.md
index 53a01b9..0f0dedc 100644
--- a/README.md
+++ b/README.md
@@ -6,25 +6,42 @@
 

 <hr>

   

-## How to Activate Windows / Office?

+## How to Activate Windows / Office / Extended Updates (ESU)?

 

-### Method 1 - PowerShell (Windows 8 and later) ❤️

+### Method 1 - PowerShell ❤️

 

-1.   **Open PowerShell**  

-	To do that, press the Windows key + X, then select PowerShell or Terminal.

+1. **Open PowerShell**  

+   Click the **Start Menu**, type `PowerShell`, then open it.

 

-2.   **Copy and paste the code below, then press enter.**  

-```

-irm https://get.activated.win | iex

-```

-Alternatively, you can use the following (this will be deprecated in the future):  

-```

-irm https://massgrave.dev/get | iex

-```

+2. **Copy and paste the code below, then press enter.**  

+   - For **Windows 8, 10, 11**: 📌

+     ```

+     irm https://get.activated.win | iex

+     ```

+   - For **Windows 7** and later:

+     ```

+     iex ((New-Object Net.WebClient).DownloadString('https://get.activated.win'))

+     ```

+

+<details>

+

+<summary>Script not launching❓Click here for info.</summary>

 

-3.   You will see the activation options. Choose the activation options highlighted in green. 

+---

 

-4.   That's all

+- If the above is blocked (by ISP/DNS), try this (needs **updated Windows 10 or 11**):

+  ```

+  iex (curl.exe -s --doh-url https://1.1.1.1/dns-query https://get.activated.win | Out-String)

+  ```

+- If that fails or you have an older Windows, use the below-listed Method 2.

+

+---

+

+</details>

+

+3. The activation menu will appear. **Choose the green-highlighted options** to activate Windows or Office.

+

+4. **Done!**

 

 ---

 

@@ -47,16 +64,14 @@ or
 

 ---

 

-- To activate additional products such as **Office for macOS, Visual Studio, RDS CALs, and Windows XP**, check [here](https://massgrave.dev/unsupported_products_activation).

-- To run the scripts in unattended mode, check [here](https://massgrave.dev/command_line_switches).

+> [!TIP]

+> - Some ISPs/DNS block access to our domains. You can bypass this by enabling [DNS-over-HTTPS (DoH)](https://developers.cloudflare.com/1.1.1.1/encryption/dns-over-https/encrypted-dns-browsers/) in your browser.  

+> - **Having trouble**❓Visit our [troubleshooting page](https://massgrave.dev/troubleshoot) or raise an issue on [GitHub](https://github.com/massgravel/Microsoft-Activation-Scripts/issues).

 

 ---

 

-### Not working ❓

-

-- If you are **unable to launch MAS** using the PowerShell method, please refer to **Method 2** listed above.

-- If MAS is launched and the script shows any errors, check for any troubleshooting steps mentioned in blue color and try to follow those.

-- If you have any issues, please feel free to reach out to us [here](https://massgrave.dev/troubleshoot).

+- To activate additional products such as **Office for macOS, Visual Studio, RDS CALs, and Windows XP**, check [here](https://massgrave.dev/unsupported_products_activation).

+- To run the scripts in unattended mode, check [here](https://massgrave.dev/command_line_switches).

 

 ---