Compare commits

..

No commits in common. "a1614e128348a8e6953e318cc5f6522a1fa2621d" and "70162c413026ec938f1049b1e4011ac64945e31e" have entirely different histories.

2 changed files with 2 additions and 32 deletions

View File

@ -4781,7 +4781,6 @@ set _prids=
set _config=
set _version=
set _License=
set _oMSI=
exit /b
::========================================================================================================================================
@ -4833,26 +4832,13 @@ call :dk_color %Gray% "Skipping Because Project/Visio Mode [%%#]"
if not defined skipprocess (
set no365=
if "%oVer%"=="15" (echo %%# | findstr /i "O365HomePremRetail" %nul% && set no365=1)
if "%oVer%"=="16" (echo %%# | findstr /i "O365" %nul% && set no365=1)
if defined no365 (
echo %%# | findstr /i "O365" %nul% && (
set _License=MondoRetail
set _altoffid=MondoRetail
call :ks_osppready
echo Converting Unsupported O365 Office [%%# To MondoRetail]
)
if not defined _oMSI (
echo %%# | findstr /i "ARM" %nul% && (
set _License=MondoRetail
set _altoffid=MondoRetail
call :ks_osppready
echo Converting Unsupported OEM-ARM Office [%%# To MondoRetail]
)
)
set keytype=zero
for /f "delims=" %%a in ('%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':offtsid\:.*';iex ($f[1])" %nul6%') do (
echo "%%a" | findstr /r ".*-.*-.*-.*-.*" %nul1% && (set tsids=!tsids! %%a& set _actid=%%a)
@ -4901,7 +4887,6 @@ exit /b
call :ts_reset
call :dk_actids 0ff1ce15-a989-479d-af46-f275c6370663
set _oMSI=1
set oVer=%1
for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\InstallRoot /v Path" %nul6%') do (set "_oRoot=%%b")
for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\ProductVersion /v LastProduct" %nul6%') do (set "_version=%%b")

View File

@ -1500,7 +1500,6 @@ set _prids=
set _config=
set _version=
set _License=
set _oMSI=
exit /b
::========================================================================================================================================
@ -1612,26 +1611,13 @@ call :dk_color %Gray% "Skipping Because Project/Visio Mode [%%#]"
if not defined skipprocess (
set no365=
if "%oVer%"=="15" (echo %%# | findstr /i "O365HomePremRetail" %nul% && set no365=1)
if "%oVer%"=="16" (echo %%# | findstr /i "O365" %nul% && set no365=1)
if defined no365 (
echo %%# | findstr /i "O365" %nul% && (
set _License=MondoRetail
set _altoffid=MondoRetail
call :ks_osppready
echo Converting Unsupported O365 Office [%%# To MondoRetail]
)
if not defined _oMSI (
echo %%# | findstr /i "ARM" %nul% && (
set _License=MondoRetail
set _altoffid=MondoRetail
call :ks_osppready
echo Converting Unsupported OEM-ARM Office [%%# To MondoRetail]
)
)
set keytype=zero
for /f "delims=" %%a in ('%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':offtsid\:.*';iex ($f[1])" %nul6%') do (
echo "%%a" | findstr /r ".*-.*-.*-.*-.*" %nul1% && (set tsids=!tsids! %%a& set _actid=%%a)
@ -1680,7 +1666,6 @@ exit /b
call :ts_reset
call :dk_actids 0ff1ce15-a989-479d-af46-f275c6370663
set _oMSI=1
set oVer=%1
for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\InstallRoot /v Path" %nul6%') do (set "_oRoot=%%b")
for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\ProductVersion /v LastProduct" %nul6%') do (set "_version=%%b")