Compare commits

..

No commits in common. "8673fbbfdabf9fdf34823c4e276ed3a4ef4095ba" and "1e3c0aaedfab33362007458996f38ba5de4c7192" have entirely different histories.

10 changed files with 26 additions and 26 deletions

View File

@ -200,7 +200,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -1068,7 +1068,7 @@ goto :dk_done
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
@ -2812,7 +2812,7 @@ call :dk_color %_Yellow% "%mas%"
:: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server :: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
:: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server :: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" ( if defined winserver if defined _config (
echo %_oIds% | find /i "Retail" %nul1% && ( echo %_oIds% | find /i "Retail" %nul1% && (
set scaIsNeeded=1 set scaIsNeeded=1
reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1% reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
@ -4869,7 +4869,7 @@ echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
:: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server :: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
:: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server :: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" ( if defined winserver if defined _config (
echo %_oIds% | find /i "Retail" %nul1% && ( echo %_oIds% | find /i "Retail" %nul1% && (
set scaIsNeeded=1 set scaIsNeeded=1
reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1% reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
@ -11261,7 +11261,7 @@ set _tserror=
set winbuild=1 set winbuild=1
set "nul=>nul 2>&1" set "nul=>nul 2>&1"
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
set psc=powershell.exe -nop -c set psc=powershell.exe
set run_once= set run_once=
set t_name=Renewal Task set t_name=Renewal Task

View File

@ -239,7 +239,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -799,7 +799,7 @@ goto :dk_done
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -242,7 +242,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -905,7 +905,7 @@ $key.SetAccessControl($acl)
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -232,7 +232,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -1027,7 +1027,7 @@ call :dk_color %_Yellow% "%mas%"
:: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server :: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
:: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server :: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" ( if defined winserver if defined _config (
echo %_oIds% | find /i "Retail" %nul1% && ( echo %_oIds% | find /i "Retail" %nul1% && (
set scaIsNeeded=1 set scaIsNeeded=1
reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1% reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
@ -1327,7 +1327,7 @@ exit /b
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -261,7 +261,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -1646,7 +1646,7 @@ set _tserror=
set winbuild=1 set winbuild=1
set "nul=>nul 2>&1" set "nul=>nul 2>&1"
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
set psc=powershell.exe -nop -c set psc=powershell.exe
set run_once= set run_once=
set t_name=Renewal Task set t_name=Renewal Task
@ -2332,7 +2332,7 @@ exit /b
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -267,7 +267,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -1638,7 +1638,7 @@ echo "!allapps!" | find /i "!_actid!" %nul1% || call :oh_installlic
:: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server :: Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
:: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server :: https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
if defined winserver if defined _config if exist "%_oLPath%\Word2019VL_KMS_Client_AE*.xrm-ms" ( if defined winserver if defined _config (
echo %_oIds% | find /i "Retail" %nul1% && ( echo %_oIds% | find /i "Retail" %nul1% && (
set scaIsNeeded=1 set scaIsNeeded=1
reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1% reg add %_config% /v SharedComputerLicensing /t REG_SZ /d "1" /f %nul1%
@ -1955,7 +1955,7 @@ exit /b
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -192,7 +192,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -1343,7 +1343,7 @@ if ($appIdsList.Count -gt 0) {
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -197,7 +197,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -815,7 +815,7 @@ exit /b
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -191,7 +191,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -723,7 +723,7 @@ exit /b
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G

View File

@ -192,7 +192,7 @@ for /f "delims=" %%a in ('cmd /c "%psc% ""if ($PSVersionTable.PSEdition -ne 'Cor
if /i not "%tstresult%"=="FullLanguage" ( if /i not "%tstresult%"=="FullLanguage" (
%eline% %eline%
echo: %tstresult% echo %tstresult%
cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode" cmd /c "%psc% $ExecutionContext.SessionState.LanguageMode"
REM check LanguageMode REM check LanguageMode
@ -1460,7 +1460,7 @@ exit /b
:dk_setvar :dk_setvar
set psc=powershell.exe -nop -c set psc=powershell.exe
set winbuild=1 set winbuild=1
for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G