Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix WAU mods default location detection #745

Merged
merged 3 commits into from
Oct 22, 2024
Merged

fix WAU mods default location detection #745

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb7db31
fix WAU mods default location detection
FaserF Oct 21, 2024
393aa71
typo $WAUModsLocatio fix
FaserF Oct 21, 2024
8409538
Improve path building for $WAUModsLocation
FaserF Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix WAU mods default location detection
  • Loading branch information
@FaserF
FaserF committed Oct 21, 2024
commit cb7db3109b32ab2aa3126e270eac540d9ae5e390
29 changes: 15 additions & 14 deletions Sources/Winget-AutoUpdate/Winget-Install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ function Test-ModsInstall ($AppID) {
$ModsPreInstall = ".\mods\$AppID-preinstall.ps1"
}
#Else, check in WAU mods
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-preinstall.ps1") {
$ModsPreInstall = "$WAUInstallLocation\mods\$AppID-preinstall.ps1"
elseif (Test-Path "$WAUModsLocatio\$AppID-preinstall.ps1") {
$ModsPreInstall = "$WAUModsLocatio\$AppID-preinstall.ps1"
}

if (Test-Path ".\mods\$AppID-install.ps1") {
$ModsInstall = ".\mods\$AppID-install.ps1"
}
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-install.ps1") {
$ModsInstall = "$WAUInstallLocation\mods\$AppID-install.ps1"
elseif (Test-Path "$WAUModsLocatio\$AppID-install.ps1") {
$ModsInstall = "$WAUModsLocatio\$AppID-install.ps1"
}

if (Test-Path ".\mods\$AppID-installed-once.ps1") {
Expand All @@ -104,8 +104,8 @@ function Test-ModsInstall ($AppID) {
if (Test-Path ".\mods\$AppID-installed.ps1") {
$ModsInstalled = ".\mods\$AppID-installed.ps1"
}
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-installed.ps1") {
$ModsInstalled = "$WAUInstallLocation\mods\$AppID-installed.ps1"
elseif (Test-Path "$WAUModsLocatio\$AppID-installed.ps1") {
$ModsInstalled = "$WAUModsLocatio\$AppID-installed.ps1"
}

return $ModsPreInstall, $ModsInstall, $ModsInstalledOnce, $ModsInstalled
Expand All @@ -118,22 +118,22 @@ function Test-ModsUninstall ($AppID) {
$ModsPreUninstall = ".\mods\$AppID-preuninstall.ps1"
}
#Else, check in WAU mods
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-preuninstall.ps1") {
$ModsPreUninstall = "$WAUInstallLocation\mods\$AppID-preuninstall.ps1"
elseif (Test-Path "$WAUModsLocatio\$AppID-preuninstall.ps1") {
$ModsPreUninstall = "$WAUModsLocatio\$AppID-preuninstall.ps1"
}

if (Test-Path ".\mods\$AppID-uninstall.ps1") {
$ModsUninstall = ".\mods\$AppID-uninstall.ps1"
}
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-uninstall.ps1") {
$ModsUninstall = "$WAUInstallLocation\mods\$AppID-uninstall.ps1"
elseif (Test-Path "$WAUModsLocatio\$AppID-uninstall.ps1") {
$ModsUninstall = "$WAUModsLocatio\$AppID-uninstall.ps1"
}

if (Test-Path ".\mods\$AppID-uninstalled.ps1") {
$ModsUninstalled = ".\mods\$AppID-uninstalled.ps1"
}
elseif (Test-Path "$WAUInstallLocation\mods\$AppID-uninstalled.ps1") {
$ModsUninstalled = "$WAUInstallLocation\mods\$AppID-uninstalled.ps1"
elseif (Test-Path "$WAUModsLocatio\$AppID-uninstalled.ps1") {
$ModsUninstalled = "$WAUModsLocatio\$AppID-uninstalled.ps1"
}

return $ModsPreUninstall, $ModsUninstall, $ModsUninstalled
Expand Down Expand Up @@ -180,7 +180,7 @@ function Install-App ($AppID, $AppArgs) {
#Add mods if deployed from Winget-Install
if (Test-Path ".\mods\$AppID-*") {
#Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods"
$Mods = "$WAUModsLocatio"
if (Test-Path $Mods) {
#Add mods
Write-ToLog "-> Add modifications for $AppID to WAU 'mods'"
Expand Down Expand Up @@ -238,7 +238,7 @@ function Uninstall-App ($AppID, $AppArgs) {
#Remove mods if deployed from Winget-Install
if (Test-Path ".\mods\$AppID-*") {
#Check if WAU default install path exists
$Mods = "$WAUInstallLocation\mods"
$Mods = "$WAUModsLocatio"
if (Test-Path "$Mods\$AppID*") {
Write-ToLog "-> Remove $AppID modifications from WAU 'mods'"
#Remove mods
Expand Down Expand Up @@ -312,6 +312,7 @@ $Script:IsElevated = $CurrentPrincipal.IsInRole([Security.Principal.WindowsBuilt
#Get WAU Installed location
$WAURegKey = "HKLM:\SOFTWARE\Romanitho\Winget-AutoUpdate\"
$Script:WAUInstallLocation = Get-ItemProperty $WAURegKey -ErrorAction SilentlyContinue | Select-Object -ExpandProperty InstallLocation
$Script:WAUModsLocation = $WAUInstallLocation + "mods"
FaserF marked this conversation as resolved.
Show resolved Hide resolved

#LogPath initialization
if (!($LogPath)) {
Expand Down
Loading