cristiancmoises
/
wingetautoupdate
mirror of https://github.com/Romanitho/Winget-AutoUpdate
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #573 from Romanitho/clean 

Changes to be used with Intune
pull/577/head
Romain 2024-02-28 16:00:30 +01:00 committed by GitHub
parent 93cbb3e5be 48326dc482
commit 83e8a79aff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Sources/WAU/Winget-AutoUpdate/Winget-Install.ps1
View File

@ -75,28 +75,30 @@ function Confirm-Exist ($AppID) {
#Check if install modifications exist in "mods" directory #Check if install modifications exist in "mods" directory
function Test-ModsInstall ($AppID) { function Test-ModsInstall ($AppID) {
if (Test-Path "$PSScriptRoot\mods\$AppID-preinstall.ps1") { #Check current location
$ModsPreInstall = "$PSScriptRoot\mods\$AppID-preinstall.ps1" if (Test-Path ".\mods\$AppID-preinstall.ps1") {
$ModsPreInstall = ".\mods\$AppID-preinstall.ps1"
} }
elseif (($WAUInstallLocation) -and (Test-Path "$WAUInstallLocation\mods\$AppID-preinstall.ps1")) { #Else, check in WAU mods
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-preinstall.ps1") {
$ModsPreInstall = "$WAUInstallLocation\mods\$AppID-preinstall.ps1" $ModsPreInstall = "$WAUInstallLocation\mods\$AppID-preinstall.ps1"
} }
if (Test-Path "$PSScriptRoot\mods\$AppID-install.ps1") { if (Test-Path ".\mods\$AppID-install.ps1") {
$ModsInstall = "$PSScriptRoot\mods\$AppID-install.ps1" $ModsInstall = ".\mods\$AppID-install.ps1"
} }
elseif (($WAUInstallLocation) -and (Test-Path "$WAUInstallLocation\mods\$AppID-install.ps1")) { elseif (Test-Path "$WAUInstallLocation\mods\$AppID-install.ps1") {
$ModsInstall = "$WAUInstallLocation\mods\$AppID-install.ps1" $ModsInstall = "$WAUInstallLocation\mods\$AppID-install.ps1"
} }
if (Test-Path "$PSScriptRoot\mods\$AppID-installed-once.ps1") { if (Test-Path ".\mods\$AppID-installed-once.ps1") {
$ModsInstalledOnce = "$PSScriptRoot\mods\$AppID-installed-once.ps1" $ModsInstalledOnce = ".\mods\$AppID-installed-once.ps1"
} }
if (Test-Path "$PSScriptRoot\mods\$AppID-installed.ps1") { if (Test-Path ".\mods\$AppID-installed.ps1") {
$ModsInstalled = "$PSScriptRoot\mods\$AppID-installed.ps1" $ModsInstalled = ".\mods\$AppID-installed.ps1"
} }
elseif (($WAUInstallLocation) -and (Test-Path "$WAUInstallLocation\mods\$AppID-installed.ps1")) { elseif (Test-Path "$WAUInstallLocation\mods\$AppID-installed.ps1") {
$ModsInstalled = "$WAUInstallLocation\mods\$AppID-installed.ps1" $ModsInstalled = "$WAUInstallLocation\mods\$AppID-installed.ps1"
} }
@ -105,24 +107,26 @@ function Test-ModsInstall ($AppID) {
#Check if uninstall modifications exist in "mods" directory #Check if uninstall modifications exist in "mods" directory
function Test-ModsUninstall ($AppID) { function Test-ModsUninstall ($AppID) {
if (Test-Path "$PSScriptRoot\mods\$AppID-preuninstall.ps1") { #Check current location
$ModsPreUninstall = "$PSScriptRoot\mods\$AppID-preuninstall.ps1" if (Test-Path ".\mods\$AppID-preuninstall.ps1") {
$ModsPreUninstall = ".\mods\$AppID-preuninstall.ps1"
} }
elseif (($WAUInstallLocation) -and (Test-Path "$WAUInstallLocation\mods\$AppID-preuninstall.ps1")) { #Else, check in WAU mods
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-preuninstall.ps1") {
$ModsPreUninstall = "$WAUInstallLocation\mods\$AppID-preuninstall.ps1" $ModsPreUninstall = "$WAUInstallLocation\mods\$AppID-preuninstall.ps1"
} }
if (Test-Path "$PSScriptRoot\mods\$AppID-uninstall.ps1") { if (Test-Path ".\mods\$AppID-uninstall.ps1") {
$ModsUninstall = "$PSScriptRoot\mods\$AppID-uninstall.ps1" $ModsUninstall = ".\mods\$AppID-uninstall.ps1"
} }
elseif (($WAUInstallLocation) -and (Test-Path "$WAUInstallLocation\mods\$AppID-uninstall.ps1")) { elseif (Test-Path "$WAUInstallLocation\mods\$AppID-uninstall.ps1") {
$ModsUninstall = "$WAUInstallLocation\mods\$AppID-uninstall.ps1" $ModsUninstall = "$WAUInstallLocation\mods\$AppID-uninstall.ps1"
} }
if (Test-Path "$PSScriptRoot\mods\$AppID-uninstalled.ps1") { if (Test-Path ".\mods\$AppID-uninstalled.ps1") {
$ModsUninstalled = "$PSScriptRoot\mods\$AppID-uninstalled.ps1" $ModsUninstalled = ".\mods\$AppID-uninstalled.ps1"
} }
elseif (($WAUInstallLocation) -and (Test-Path "$WAUInstallLocation\mods\$AppID-uninstalled.ps1")) { elseif (Test-Path "$WAUInstallLocation\mods\$AppID-uninstalled.ps1") {
$ModsUninstalled = "$WAUInstallLocation\mods\$AppID-uninstalled.ps1" $ModsUninstalled = "$WAUInstallLocation\mods\$AppID-uninstalled.ps1"
} }
@ -168,8 +172,14 @@ function Install-App ($AppID, $AppArgs) {
} }
#Add mods if deployed from Winget-Install #Add mods if deployed from Winget-Install
if ((Test-Path "$PSScriptRoot\mods\$AppID-preinstall.ps1") -or (Test-Path "$PSScriptRoot\mods\$AppID-upgrade.ps1") -or (Test-Path "$PSScriptRoot\mods\$AppID-install.ps1") -or (Test-Path "$PSScriptRoot\mods\$AppID-installed.ps1")) { if (Test-Path ".\mods\$AppID-*") {
Add-WAUMods $AppID #Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods"
if (Test-Path $Mods) {
#Add mods
Write-ToLog "-> Add modifications for $AppID to WAU 'mods'"
Copy-Item ".\mods\$AppID-*" -Destination "$Mods" -Exclude "*installed-once*", "*uninstall*" -Force
}
} }
#Add to WAU White List if set #Add to WAU White List if set
@ -220,8 +230,14 @@ function Uninstall-App ($AppID, $AppArgs) {
} }
#Remove mods if deployed from Winget-Install #Remove mods if deployed from Winget-Install
if ((Test-Path "$PSScriptRoot\mods\$AppID-preinstall.ps1") -or (Test-Path "$PSScriptRoot\mods\$AppID-upgrade.ps1") -or (Test-Path "$PSScriptRoot\mods\$AppID-install.ps1") -or (Test-Path "$PSScriptRoot\mods\$AppID-installed.ps1")) { if (Test-Path ".\mods\$AppID-*") {
Remove-WAUMods $AppID #Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods"
if (Test-Path "$Mods\$AppID*") {
Write-ToLog "-> Remove $AppID modifications from WAU 'mods'"
#Remove mods
Remove-Item -Path "$Mods\$AppID-*" -Exclude "*uninstall*" -Force
}
} }
#Remove from WAU White List if set #Remove from WAU White List if set
@ -264,29 +280,6 @@ function Remove-WAUWhiteList ($AppID) {
} }
} }
#Function to Add Mods to WAU "mods"
function Add-WAUMods ($AppID) {
#Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods"
if (Test-Path $Mods) {
#Add mods
Write-ToLog "-> Add modifications for $AppID to WAU 'mods'"
Copy-Item "$PSScriptRoot\mods\$AppID-*" -Destination "$Mods" -Exclude "*installed-once*", "*uninstall*" -Force
}
}
#Function to Remove Mods from WAU "mods"
function Remove-WAUMods ($AppID) {
#Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods"
if (Test-Path "$Mods\$AppID*") {
Write-ToLog "-> Remove $AppID modifications from WAU 'mods'"
#Remove mods
Remove-Item -Path "$Mods\$AppID-*" -Exclude "*uninstall*" -Force
}
}
<# MAIN #> <# MAIN #>
#If running as a 32-bit process on an x64 system, re-launch as a 64-bit process #If running as a 32-bit process on an x64 system, re-launch as a 64-bit process