ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-06-14 02:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added handling of win32 apps using the msstore source in winget download command, updated InstallAppsandSysprep.cmd file to use store app license files, and updated AppList.txt with winget prefix, instead of win32

Browse Source
This commit is contained in:
Zehadi Alam
2024-07-02 20:45:14 -04:00
parent 0010c8ad81
commit 95a4664b26
3 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/Apps/AppsList.txt
+1 -1
View File
@@ -1,2 +1,2 @@
win32:7-Zip
winget:7-Zip
store:Company Portal
FFUDevelopment/Apps/InstallAppsandSysprep.cmd
+14 -2
View File
@@ -22,16 +22,28 @@ for /d %%D in ("%basepath%\*") do (
set "dependenciesfolder=!appfolder!\Dependencies"
for %%F in ("!appfolder!\*") do (
if not "%%~dpF"=="!dependenciesfolder!\" (
set "mainpackage=%%F"
if /i not "%%~xF"==".xml" (
if /i not "%%~xF"==".yaml" (
set "mainpackage=%%F"
)
)
)
)
for %%F in ("!appfolder!\*.xml") do (
set "licensefile=%%F"
)
if defined mainpackage (
if exist "!dependenciesfolder!" (
set "dism_command=DISM /Online /Add-ProvisionedAppxPackage /PackagePath:"!mainpackage!""
for %%G in ("!dependenciesfolder!\*") do (
set "dism_command=!dism_command! /DependencyPackagePath:"%%G""
)
set "dism_command=!dism_command! /SkipLicense /Region:All"
if defined licensefile (
set "dism_command=!dism_command! /LicensePath:"!licensefile!""
) else (
set "dism_command=!dism_command! /SkipLicense"
)
set "dism_command=!dism_command! /Region:All"
echo !dism_command!
!dism_command!
)