Change some variable names

1 files changed, 8 insertions, 6 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index c5077ab..8c44c3a 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -1534,7 +1534,7 @@ echo Checking WPA Registry Count             [%wpainfo%]
 )

 

 

-if not defined officeact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (

+if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (

 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (

 set error=1

 call :dk_color %Red% "Checking Eval Packages                  [Non-Eval Licenses are installed in Eval Windows]"

@@ -1558,7 +1558,7 @@ if "%osSKU%"=="164" set osedition=ProfessionalEducation
 if "%osSKU%"=="165" set osedition=ProfessionalEducationN

 )

 

-if not defined officeact (

+if not defined notwinact (

 if %osedition%==0 (

 call :dk_color %Red% "Checking Edition Name                   [Not Found In Registry]"

 ) else (

@@ -1601,7 +1601,7 @@ set showfix=1
 )

 

 

-if not defined officeact (

+if not defined notwinact (

 if %winbuild% GEQ 10240 (

 %nul% set /a "sum=%slcSKU%+%regSKU%+%wmiSKU%"

 set /a "sum/=3"

@@ -2152,7 +2152,8 @@ set "_serv=sppsvc Winmgmt"
 ::  Software Protection

 ::  Windows Management Instrumentation

 

-set officeact=1

+set notwinact=1

+set ohookact=1

 call :dk_errorcheck

 

 ::  Check unsupported office versions

@@ -2936,7 +2937,7 @@ echo Clearing Office License Blocks          [Successfully cleared from all %cou
 set defname=DEFTEMP-%random%

 for /f "skip=2 tokens=2*" %%a in ('"reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" /v Default" %nul6%') do call set "defdat=%%b"

 

-if defined o16c2r if defined officeact (

+if defined o16c2r if defined ohookact (

 if exist "%defdat%\NTUSER.DAT" (

 reg load HKU\%defname% "%defdat%\NTUSER.DAT" %nul%

 reg query HKU\%defname%\Software %nul% && (

@@ -2991,7 +2992,7 @@ set upk_result=2
 )

 )

 

-if defined officeact if not %upk_result%==0 echo:

+if defined ohookact if not %upk_result%==0 echo:

 if %upk_result%==1 echo Uninstalling Other/Grace Keys           [Successful]

 if %upk_result%==2 call :dk_color %Red% "Uninstalling Other/Grace Keys           [Failed]"

 exit /b

@@ -4534,6 +4535,7 @@ set "_serv=sppsvc Winmgmt"
 ::  Software Protection

 ::  Windows Management Instrumentation

 

+if %_actwin%==0 set notwinact=1

 call :dk_errorcheck

 

 ::========================================================================================================================================