mirror of
https://github.com/massgravel/Microsoft-Activation-Scripts.git
synced 2025-01-17 23:37:19 -05:00
Change some variable names
This commit is contained in:
parent
b732e2c8d7
commit
9fd5a661ab
@ -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
|
||||
|
||||
::========================================================================================================================================
|
||||
|
@ -1281,7 +1281,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]"
|
||||
@ -1305,7 +1305,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 (
|
||||
@ -1348,7 +1348,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"
|
||||
|
@ -1433,7 +1433,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]"
|
||||
@ -1457,7 +1457,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 (
|
||||
@ -1500,7 +1500,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"
|
||||
|
@ -400,7 +400,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
|
||||
@ -1184,7 +1185,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% && (
|
||||
@ -1239,7 +1240,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
|
||||
@ -1703,7 +1704,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]"
|
||||
@ -1727,7 +1728,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 (
|
||||
@ -1770,7 +1771,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"
|
||||
|
@ -483,6 +483,7 @@ set "_serv=sppsvc Winmgmt"
|
||||
:: Software Protection
|
||||
:: Windows Management Instrumentation
|
||||
|
||||
if %_actwin%==0 set notwinact=1
|
||||
call :dk_errorcheck
|
||||
|
||||
::========================================================================================================================================
|
||||
@ -1393,7 +1394,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% && (
|
||||
@ -1448,7 +1449,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
|
||||
@ -2860,7 +2861,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]"
|
||||
@ -2884,7 +2885,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 (
|
||||
@ -2927,7 +2928,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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user