From 2237c805f4bff1a42424f113c592840a97a79ab4 Mon Sep 17 00:00:00 2001 From: tomamplius Date: Mon, 27 May 2024 17:00:50 +0200 Subject: [PATCH 1/4] allow update --- Sources/WAU/Winget-AutoUpdate/Winget-Install.ps1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Sources/WAU/Winget-AutoUpdate/Winget-Install.ps1 b/Sources/WAU/Winget-AutoUpdate/Winget-Install.ps1 index 73f4395..ec24e6f 100644 --- 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,6 +37,9 @@ 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()] @@ -41,7 +47,8 @@ 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) From 56d4ba24deeaeeb0c5e62c4a75a4d1e99227968c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 06:17:42 +0000 Subject: [PATCH 2/4] Bump oxsecurity/megalinter from 7.11.1 to 7.12.0 Bumps [oxsecurity/megalinter](https://github.com/oxsecurity/megalinter) from 7.11.1 to 7.12.0. - [Release notes](https://github.com/oxsecurity/megalinter/releases) - [Changelog](https://github.com/oxsecurity/megalinter/blob/main/CHANGELOG.md) - [Commits](https://github.com/oxsecurity/megalinter/compare/03986e6993ccf699a22451118520680b438e7d2a...5199c6377b4cb7faff749a1971636f3343db9fe6) --- updated-dependencies: - dependency-name: oxsecurity/megalinter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/mega-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 7ac5fff..8f438c8 100644 --- 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/ From 4c92ca8c3134e0604cafa695f7ef76e473a264fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 4 Jun 2024 10:56:04 +0000 Subject: [PATCH 3/4] Changed version to 1.20.1 --- Sources/WAU/Winget-AutoUpdate/Version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/WAU/Winget-AutoUpdate/Version.txt b/Sources/WAU/Winget-AutoUpdate/Version.txt index ad24106..1acb46a 100644 --- a/Sources/WAU/Winget-AutoUpdate/Version.txt +++ b/Sources/WAU/Winget-AutoUpdate/Version.txt @@ -1 +1 @@ -1.20.1-1 \ No newline at end of file +1.20.1 \ No newline at end of file From 0d2b7358cd6ae1e55240c6059a661034dcc557a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 5 Jun 2024 01:24:53 +0000 Subject: [PATCH 4/4] Changed version to 1.20.2-0 --- Sources/WAU/Winget-AutoUpdate/Version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/WAU/Winget-AutoUpdate/Version.txt b/Sources/WAU/Winget-AutoUpdate/Version.txt index 1acb46a..9595910 100644 --- a/Sources/WAU/Winget-AutoUpdate/Version.txt +++ b/Sources/WAU/Winget-AutoUpdate/Version.txt @@ -1 +1 @@ -1.20.1 \ No newline at end of file +1.20.2-0 \ No newline at end of file