diff --git a/windick.cmd b/windick.cmd index 978e262..102b5d9 100644 --- a/windick.cmd +++ b/windick.cmd @@ -534,7 +534,7 @@ EXIT /B SET "RND1=%RANDOM%%RANDOM%"&&SET "RND1=!RND1:~5,5!"&&SET "RND1=!RND1:~1,1!" EXIT /B :CLEAN -FOR %%G in (HZ TMP LST DSK PAK DRVR DISM) DO (IF EXIST "$%%G*" DEL /Q /F "$%%G*">NUL) +FOR %%G in (HZ TMP LST DSK PAK DRVR) DO (IF EXIST "$%%G*" DEL /Q /F "$%%G*">NUL) IF EXIST "%TEMP%\DISK_TARGET" DEL /Q /F "%TEMP%\DISK_TARGET">NUL 2>&1 EXIT /B :CHECK @@ -1817,12 +1817,12 @@ ECHO Extracting %#@%%PackFull%%#$%... DISM /ENGLISH /APPLY-IMAGE /IMAGEFILE:"%IMAGE_PACK%" /INDEX:1 /APPLYDIR:"%SCRATCH_PACK%">NUL :PACK_JUMP IF "%PackType%"=="SCRIPTED" IF NOT "%PackTag%"=="MOUNT" IF NOT "%PackTag%"=="UNMOUNT" ECHO %XLR2%Package outdated. Missing mount option.%#$%&&GOTO:PACK_INSTALL_FINISH -FOR %%a in (.APPX .CAB .MSU) DO (IF "%PackExt%"=="%%a" ECHO Installing %#@%%PackFull%%#$%...) +FOR %%G in (APPXBUNDLE MSIXBUNDLE) DO (IF "%PackExt%"==".%%G" SET "PackExt=.APPX") +FOR %%a in (APPX CAB MSU) DO (IF "%PackExt%"==".%%a" ECHO Installing %#@%%PackFull%%#$%...) IF "%PackType%"=="SCRIPTED" ECHO Running %#@%%PackFull%%#$%... IF "%PackType%"=="SCRIPTED" IF "%PackTag%"=="MOUNT" CALL:IF_LIVE_EXT IF "%PackType%"=="SCRIPTED" IF "%PackTag%"=="UNMOUNT" CALL:IF_LIVE_MIX IF "%PackType%"=="DRIVER" CALL:IF_LIVE_MIX -FOR %%G in (APPXBUNDLE MSIXBUNDLE) DO (IF "%PackExt%"==".%%G" SET "PackExt=.APPX") IF "%PackExt%"==".APPX" SET "DISMSG="&&FOR /F "TOKENS=1 DELIMS=." %%1 in ('DISM /ENGLISH /%APPLY_TARGET% /ADD-PROVISIONEDAPPXPACKAGE /PACKAGEPATH:"%IMAGE_PACK%" 2^>NUL') DO (IF "%%1"=="%PACK_GOOD%" CALL SET "DISMSG=%PACK_GOOD%"&&CALL ECHO %XLR5%%PACK_GOOD%.%#$%&&GOTO:PACK_INSTALL_FINISH) IF "%PackExt%"==".APPX" IF NOT DEFINED DISMSG FOR /F "TOKENS=1 DELIMS=." %%1 in ('DISM /ENGLISH /%APPLY_TARGET% /ADD-PROVISIONEDAPPXPACKAGE /PACKAGEPATH:"%IMAGE_PACK%" /SKIPLICENSE 2^>NUL') DO (IF "%%1"=="%PACK_GOOD%" CALL SET "DISMSG=%PACK_GOOD%"&&CALL ECHO %XLR5%%PACK_GOOD%.%#$%&&GOTO:PACK_INSTALL_FINISH) IF "%PackExt%"==".APPX" CALL ECHO %XLR2%%PACK_BAD%.%#$%&&GOTO:PACK_INSTALL_FINISH @@ -1842,9 +1842,6 @@ IF NOT EXIST "%%a\*" IF NOT DEFINED DISMSG CALL ECHO %XLR2%%PACK_BAD%.%#$%) FOR %%a in (DRVR PAK) DO (IF EXIST "$%%a" DEL /Q /F "$%%a">NUL) CALL:SCRATCH_PACK_DELETE&&CALL:MOUNT_NONE EXIT /B -:PACK_CHECK -SET "DISMSG="&&FOR /F "TOKENS=1 DELIMS=." %%1 in ($DRVR) DO (IF "%%1"=="%PACK_GOOD%" CALL SET "DISMSG=1") -EXIT /B :DISM_OPER IF NOT DEFINED BASE_MEAT ECHO ERROR&&EXIT /B SET "CAPS_SET=DISM_OPER"&&SET "CAPS_VAR=%DISM_OPER%"&&CALL:CAPS_SET