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

Merge pull request #745 from FaserF/fix-WAU-mods-defaultlocation 

fix WAU mods default location detection
pull/753/head v2.0.2-n
Romain 2024-10-22 11:44:20 +02:00 committed by GitHub
parent 646575d3ba 8409538a2e
commit 773579f09c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Sources/Winget-AutoUpdate/Winget-Install.ps1
View File

@ -86,15 +86,15 @@ function Test-ModsInstall ($AppID) {
$ModsPreInstall = ".\mods\$AppID-preinstall.ps1" $ModsPreInstall = ".\mods\$AppID-preinstall.ps1"
} }
#Else, check in WAU mods #Else, check in WAU mods
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-preinstall.ps1") { elseif (Test-Path "$WAUModsLocation\$AppID-preinstall.ps1") {
$ModsPreInstall = "$WAUInstallLocation\mods\$AppID-preinstall.ps1" $ModsPreInstall = "$WAUModsLocation\$AppID-preinstall.ps1"
} }
if (Test-Path ".\mods\$AppID-install.ps1") { if (Test-Path ".\mods\$AppID-install.ps1") {
$ModsInstall = ".\mods\$AppID-install.ps1" $ModsInstall = ".\mods\$AppID-install.ps1"
} }
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-install.ps1") { elseif (Test-Path "$WAUModsLocation\$AppID-install.ps1") {
$ModsInstall = "$WAUInstallLocation\mods\$AppID-install.ps1" $ModsInstall = "$WAUModsLocation\$AppID-install.ps1"
} }
if (Test-Path ".\mods\$AppID-installed-once.ps1") { if (Test-Path ".\mods\$AppID-installed-once.ps1") {
@ -104,8 +104,8 @@ function Test-ModsInstall ($AppID) {
if (Test-Path ".\mods\$AppID-installed.ps1") { if (Test-Path ".\mods\$AppID-installed.ps1") {
$ModsInstalled = ".\mods\$AppID-installed.ps1" $ModsInstalled = ".\mods\$AppID-installed.ps1"
} }
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-installed.ps1") { elseif (Test-Path "$WAUModsLocation\$AppID-installed.ps1") {
$ModsInstalled = "$WAUInstallLocation\mods\$AppID-installed.ps1" $ModsInstalled = "$WAUModsLocation\$AppID-installed.ps1"
} }
return $ModsPreInstall, $ModsInstall, $ModsInstalledOnce, $ModsInstalled return $ModsPreInstall, $ModsInstall, $ModsInstalledOnce, $ModsInstalled
@ -118,22 +118,22 @@ function Test-ModsUninstall ($AppID) {
$ModsPreUninstall = ".\mods\$AppID-preuninstall.ps1" $ModsPreUninstall = ".\mods\$AppID-preuninstall.ps1"
} }
#Else, check in WAU mods #Else, check in WAU mods
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-preuninstall.ps1") { elseif (Test-Path "$WAUModsLocation\$AppID-preuninstall.ps1") {
$ModsPreUninstall = "$WAUInstallLocation\mods\$AppID-preuninstall.ps1" $ModsPreUninstall = "$WAUModsLocation\$AppID-preuninstall.ps1"
} }
if (Test-Path ".\mods\$AppID-uninstall.ps1") { if (Test-Path ".\mods\$AppID-uninstall.ps1") {
$ModsUninstall = ".\mods\$AppID-uninstall.ps1" $ModsUninstall = ".\mods\$AppID-uninstall.ps1"
} }
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-uninstall.ps1") { elseif (Test-Path "$WAUModsLocation\$AppID-uninstall.ps1") {
$ModsUninstall = "$WAUInstallLocation\mods\$AppID-uninstall.ps1" $ModsUninstall = "$WAUModsLocation\$AppID-uninstall.ps1"
} }
if (Test-Path ".\mods\$AppID-uninstalled.ps1") { if (Test-Path ".\mods\$AppID-uninstalled.ps1") {
$ModsUninstalled = ".\mods\$AppID-uninstalled.ps1" $ModsUninstalled = ".\mods\$AppID-uninstalled.ps1"
} }
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-uninstalled.ps1") { elseif (Test-Path "$WAUModsLocation\$AppID-uninstalled.ps1") {
$ModsUninstalled = "$WAUInstallLocation\mods\$AppID-uninstalled.ps1" $ModsUninstalled = "$WAUModsLocation\$AppID-uninstalled.ps1"
} }
return $ModsPreUninstall, $ModsUninstall, $ModsUninstalled return $ModsPreUninstall, $ModsUninstall, $ModsUninstalled
@ -180,7 +180,7 @@ function Install-App ($AppID, $AppArgs) {
#Add mods if deployed from Winget-Install #Add mods if deployed from Winget-Install
if (Test-Path ".\mods\$AppID-*") { if (Test-Path ".\mods\$AppID-*") {
#Check if WAU default install path exists #Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods" $Mods = "$WAUModsLocation"
if (Test-Path $Mods) { if (Test-Path $Mods) {
#Add mods #Add mods
Write-ToLog "-> Add modifications for $AppID to WAU 'mods'" Write-ToLog "-> Add modifications for $AppID to WAU 'mods'"
@ -238,7 +238,7 @@ function Uninstall-App ($AppID, $AppArgs) {
#Remove mods if deployed from Winget-Install #Remove mods if deployed from Winget-Install
if (Test-Path ".\mods\$AppID-*") { if (Test-Path ".\mods\$AppID-*") {
#Check if WAU default install path exists #Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods" $Mods = "$WAUModsLocation"
if (Test-Path "$Mods\$AppID*") { if (Test-Path "$Mods\$AppID*") {
Write-ToLog "-> Remove $AppID modifications from WAU 'mods'" Write-ToLog "-> Remove $AppID modifications from WAU 'mods'"
#Remove mods #Remove mods
@ -312,6 +312,7 @@ $Script:IsElevated = $CurrentPrincipal.IsInRole([Security.Principal.WindowsBuilt
#Get WAU Installed location #Get WAU Installed location
$WAURegKey = "HKLM:\SOFTWARE\Romanitho\Winget-AutoUpdate\" $WAURegKey = "HKLM:\SOFTWARE\Romanitho\Winget-AutoUpdate\"
$Script:WAUInstallLocation = Get-ItemProperty $WAURegKey -ErrorAction SilentlyContinue | Select-Object -ExpandProperty InstallLocation $Script:WAUInstallLocation = Get-ItemProperty $WAURegKey -ErrorAction SilentlyContinue | Select-Object -ExpandProperty InstallLocation
$Script:WAUModsLocation = Join-Path -Path $WAUInstallLocation -ChildPath "mods"
#LogPath initialization #LogPath initialization
if (!($LogPath)) { if (!($LogPath)) {