Merge branch 'Romanitho:main' into SymLink_Fix

Romanitho · Jul 13, 2024 · 3e860ec · 3e860ec
2 parents 1ad487e + 0d2b735
commit 3e860ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
@@ -44,7 +44,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.github.io/flavors/
-        uses: oxsecurity/megalinter@03986e6993ccf699a22451118520680b438e7d2a # v7.11.1
+        uses: oxsecurity/megalinter@5199c6377b4cb7faff749a1971636f3343db9fe6 # v7.12.0
         env:
           # All available variables are described in documentation
           # https://megalinter.github.io/configuration/

diff --git a/Sources/WAU/Winget-AutoUpdate/Version.txt b/Sources/WAU/Winget-AutoUpdate/Version.txt
@@ -1 +1 @@
-1.20.1-1
+1.20.2-0
diff --git a/Sources/WAU/Winget-AutoUpdate/Winget-Install.ps1 b/Sources/WAU/Winget-AutoUpdate/Winget-Install.ps1
@@ -13,6 +13,9 @@ Forward Winget App ID to install. For multiple apps, separate with ",". Case sen
 .PARAMETER Uninstall
 To uninstall app. Works with AppIDs
 
+.PARAMETER AllowUpgrade
+To allow upgrade app if present. Works with AppIDs
+
 .PARAMETER LogPath
 Used to specify logpath. Default is same folder as Winget-Autoupdate project
 
@@ -34,14 +37,18 @@ If '-Uninstall' is used, it removes the app from WAU White List.
 
 .EXAMPLE
 .\winget-install.ps1 -AppIDs "7zip.7zip -v 22.00", "Notepad++.Notepad++"
+
+.EXAMPLE
+.\winget-install.ps1 -AppIDs "Notepad++.Notepad++" -AllowUpgrade
 #>
 
 [CmdletBinding()]
 param(
     [Parameter(Mandatory = $True, ParameterSetName = "AppIDs")] [String[]] $AppIDs,
     [Parameter(Mandatory = $False)] [Switch] $Uninstall,
     [Parameter(Mandatory = $False)] [String] $LogPath,
-    [Parameter(Mandatory = $False)] [Switch] $WAUWhiteList
+    [Parameter(Mandatory = $False)] [Switch] $WAUWhiteList,
+    [Parameter(Mandatory = $False)] [Switch] $AllowUpgrade
 )
 
 
@@ -136,7 +143,7 @@ function Test-ModsUninstall ($AppID) {
 #Install function
 function Install-App ($AppID, $AppArgs) {
     $IsInstalled = Confirm-Installation $AppID
-    if (!($IsInstalled)) {
+    if (!($IsInstalled) -or $AllowUpgrade ) {
         #Check if mods exist (or already exist) for preinstall/install/installedonce/installed
         $ModsPreInstall, $ModsInstall, $ModsInstalledOnce, $ModsInstalled = Test-ModsInstall $($AppID)