Merge pull request #732 from Romanitho/Tempo

Minor changes
pull/737/head v1.22.5-n
Romain 2024-10-09 01:01:22 +02:00 committed by GitHub
commit 5143c19e33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions

View File

@ -366,8 +366,11 @@ else {
} }
if ($Winget) { if ($Winget) {
#Put apps in an array
$AppIDsArray = $AppIDs -split ","
#Run install or uninstall for all apps #Run install or uninstall for all apps
foreach ($App_Full in $AppIDs) { foreach ($App_Full in $AppIDsArray) {
#Split AppID and Custom arguments #Split AppID and Custom arguments
$AppID, $AppArgs = ($App_Full.Trim().Split(" ", 2)) $AppID, $AppArgs = ($App_Full.Trim().Split(" ", 2))

View File

@ -27,15 +27,13 @@ function Install-Prerequisites {
$SourceURL = "https://aka.ms/vs/17/release/VC_redist.$OSArch.exe" $SourceURL = "https://aka.ms/vs/17/release/VC_redist.$OSArch.exe"
$Installer = "$env:TEMP\VC_redist.$OSArch.exe" $Installer = "$env:TEMP\VC_redist.$OSArch.exe"
Write-ToLog "-> Downloading $SourceURL..." Write-ToLog "-> Downloading $SourceURL..."
Invoke-WebRequest $SourceURL -UseBasicParsing -OutFile $Installer Invoke-WebRequest $SourceURL -OutFile $Installer -UseBasicParsing
Write-ToLog "-> Installing VC_redist.$OSArch.exe..." Write-ToLog "-> Installing VC_redist.$OSArch.exe..."
Start-Process -FilePath $Installer -Args "/quiet /norestart" -Wait Start-Process -FilePath $Installer -Args "/quiet /norestart" -Wait
Start-Sleep 3
Write-ToLog "-> MS Visual C++ 2015-2022 installed successfully." "Green" Write-ToLog "-> MS Visual C++ 2015-2022 installed successfully." "Green"
} }
catch { catch {
Write-ToLog "-> MS Visual C++ 2015-2022 installation failed." "Red" Write-ToLog "-> MS Visual C++ 2015-2022 installation failed." "Red"
Start-Sleep 3
} }
finally { finally {
Remove-Item $Installer -ErrorAction Ignore Remove-Item $Installer -ErrorAction Ignore
@ -50,7 +48,7 @@ function Install-Prerequisites {
$VCLibsUrl = "https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx" $VCLibsUrl = "https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx"
$VCLibsFile = "$env:TEMP\Microsoft.VCLibs.x64.14.00.Desktop.appx" $VCLibsFile = "$env:TEMP\Microsoft.VCLibs.x64.14.00.Desktop.appx"
Write-ToLog "-> Downloading Microsoft.VCLibs.140.00.UWPDesktop..." Write-ToLog "-> Downloading Microsoft.VCLibs.140.00.UWPDesktop..."
Invoke-RestMethod -Uri $VCLibsUrl -OutFile $VCLibsFile Invoke-WebRequest -Uri $VCLibsUrl -OutFile $VCLibsFile -UseBasicParsing
#Install #Install
Write-ToLog "-> Installing Microsoft.VCLibs.140.00.UWPDesktop..." Write-ToLog "-> Installing Microsoft.VCLibs.140.00.UWPDesktop..."
Add-AppxProvisionedPackage -Online -PackagePath $VCLibsFile -SkipLicense | Out-Null Add-AppxProvisionedPackage -Online -PackagePath $VCLibsFile -SkipLicense | Out-Null
@ -72,7 +70,7 @@ function Install-Prerequisites {
$UIXamlUrl = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.6/Microsoft.UI.Xaml.2.8.x64.appx" $UIXamlUrl = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.6/Microsoft.UI.Xaml.2.8.x64.appx"
$UIXamlFile = "$env:TEMP\Microsoft.UI.Xaml.2.8.x64.appx" $UIXamlFile = "$env:TEMP\Microsoft.UI.Xaml.2.8.x64.appx"
Write-ToLog "-> Downloading Microsoft.UI.Xaml.2.8..." Write-ToLog "-> Downloading Microsoft.UI.Xaml.2.8..."
Invoke-RestMethod -Uri $UIXamlUrl -OutFile $UIXamlFile Invoke-WebRequest -Uri $UIXamlUrl -OutFile $UIXamlFile -UseBasicParsing
#Install #Install
Write-ToLog "-> Installing Microsoft.UI.Xaml.2.8..." Write-ToLog "-> Installing Microsoft.UI.Xaml.2.8..."
Add-AppxProvisionedPackage -Online -PackagePath $UIXamlFile -SkipLicense | Out-Null Add-AppxProvisionedPackage -Online -PackagePath $UIXamlFile -SkipLicense | Out-Null
@ -115,7 +113,7 @@ function Install-Prerequisites {
Write-ToLog "-> Downloading WinGet MSIXBundle for App Installer..." Write-ToLog "-> Downloading WinGet MSIXBundle for App Installer..."
$WinGetURL = "https://github.com/microsoft/winget-cli/releases/download/v$WinGetAvailableVersion/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle" $WinGetURL = "https://github.com/microsoft/winget-cli/releases/download/v$WinGetAvailableVersion/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
$WingetInstaller = "$env:TEMP\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle" $WingetInstaller = "$env:TEMP\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
Invoke-RestMethod -Uri $WinGetURL -OutFile $WingetInstaller Invoke-WebRequest -Uri $WinGetURL -OutFile $WingetInstaller -UseBasicParsing
#Install #Install
Write-ToLog "-> Installing WinGet MSIXBundle for App Installer..." Write-ToLog "-> Installing WinGet MSIXBundle for App Installer..."
@ -128,13 +126,11 @@ function Install-Prerequisites {
$WingetCmd = $WingetInfo[-1].FileName $WingetCmd = $WingetInfo[-1].FileName
& $WingetCmd source reset --force & $WingetCmd source reset --force
Write-ToLog "-> WinGet sources reset." "green" Write-ToLog "-> WinGet sources reset." "green"
$return = "success"
} }
catch { catch {
Write-ToLog "-> Failed to install WinGet MSIXBundle for App Installer..." "red" Write-ToLog "-> Failed to install WinGet MSIXBundle for App Installer..." "red"
#Force Store Apps to update #Force Store Apps to update
Update-StoreApps Update-StoreApps
$return = "fail"
} }
#Remove WinGet MSIXBundle #Remove WinGet MSIXBundle