Merge branch 'Romanitho:main' into add-winget-install-informations
commit
5874e58c13
|
@ -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@c217fe8f7bc9207062a084e989bd97efd56e7b9a # v8.0.0
|
||||
uses: oxsecurity/megalinter@b38cdf1f0cbe056fad4112cb7cd99c2b574c9617 # v8.1.0
|
||||
env:
|
||||
# All available variables are described in documentation
|
||||
# https://megalinter.github.io/configuration/
|
||||
|
|
|
@ -19,8 +19,6 @@ Just download latest release [WAU.msi](https://github.com/Romanitho/Winget-AutoU
|
|||
![2](https://github.com/user-attachments/assets/46913e03-8604-43f5-8bca-129d1e714e45)
|
||||
|
||||
|
||||
|
||||
|
||||
## Configurations
|
||||
### Keep some apps out of Winget-AutoUpdate
|
||||
- #### BlockList
|
||||
|
@ -31,6 +29,9 @@ You can update only pre-selected apps. To do so, create an "included_apps.txt" w
|
|||
|
||||
> The lists can contain Wildcard (*). For instance ```Mozilla.Firefox*``` will take care of all Firefox channels.
|
||||
|
||||
List and Mods folder content will be copied to WAU install location:
|
||||
![image](https://github.com/user-attachments/assets/f0ec4047-d66c-4277-a39c-763fd7516ad8)
|
||||
|
||||
### Notification Level
|
||||
You can choose which notification will be displayed: `Full`, `Success only` or `None`.
|
||||
|
||||
|
@ -157,7 +158,7 @@ Default value 1. Set `UPDATESATLOGON=0` to disable WAU from running at user logo
|
|||
Default value Never. Specify the update frequency: Daily, BiDaily, Weekly, BiWeekly, Monthly or Never.
|
||||
|
||||
**UPDATESATTIME**<br>
|
||||
Default value 6AM. Specify the time of the update interval execution time.
|
||||
Default value 6AM (06:00:00). Specify the time of the update interval execution time. Example `UPDATESATTIME="11:00:00"`
|
||||
|
||||
**DONOTRUNONMETERED**<br>
|
||||
Default value 1. Set `DONOTRUNONMETERED=0` to force WAU to run on metered connections. May add cellular data costs on shared connexion from smartphone for example.
|
||||
|
|
|
@ -92,7 +92,7 @@ function Install-WingetAutoUpdate {
|
|||
Register-ScheduledTask -TaskName 'Winget-AutoUpdate-UserContext' -TaskPath 'WAU' -InputObject $task -Force | Out-Null
|
||||
|
||||
# Settings for the scheduled task for Notifications
|
||||
$taskAction = New-ScheduledTaskAction -Execute "conhost.exe" -Argument "--headless powershell.exe -NoProfile -ExecutionPolicy Bypass -File winget-notify.ps1" -WorkingDirectory $InstallPath
|
||||
$taskAction = New-ScheduledTaskAction -Execute "conhost.exe" -Argument "--headless powershell.exe -NoProfile -ExecutionPolicy Bypass -File WAU-Notify.ps1" -WorkingDirectory $InstallPath
|
||||
$taskUserPrincipal = New-ScheduledTaskPrincipal -GroupId S-1-5-11
|
||||
$taskSettings = New-ScheduledTaskSettingsSet -Compatibility Win8 -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit 00:05:00
|
||||
# Set up the task, and register it
|
||||
|
|
|
@ -80,7 +80,7 @@
|
|||
<RegistrySearch Id="SearchDoNotRunOnMetered" Type="raw" Root="HKLM" Key="SOFTWARE\[Manufacturer]\[ProductName]" Name="WAU_DoNotRunOnMetered" />
|
||||
</Property>
|
||||
<Property Id="UPDATESATTIME" Secure="yes" />
|
||||
<Property Id="UPDATESATTIME_VALUE" Value="06am">
|
||||
<Property Id="UPDATESATTIME_VALUE" Value="06:00:00">
|
||||
<RegistrySearch Id="SearchUpdatesAtTime" Type="raw" Root="HKLM" Key="SOFTWARE\[Manufacturer]\[ProductName]" Name="WAU_UpdatesAtTime" />
|
||||
</Property>
|
||||
<Property Id="BYPASSLISTFORUSERS" Secure="yes" />
|
||||
|
@ -251,13 +251,13 @@
|
|||
<SetProperty Id="MAXLOGSIZE_VALUE" After="AppSearch" Value="#[MAXLOGSIZE]" Condition="MAXLOGSIZE" />
|
||||
<SetProperty Action="SetUPDATEPRERELEASE_0" Id="UPDATEPRERELEASE" After="AppSearch" Value="0" Condition="(NOT UPDATEPRERELEASE) AND (UPDATEPRERELEASE_VALUE <> "#1")" />
|
||||
<SetProperty Action="SetUPDATEPRERELEASE_1" Id="UPDATEPRERELEASE" After="AppSearch" Value="1" Condition="(NOT UPDATEPRERELEASE) AND (UPDATEPRERELEASE_VALUE = "#1")" />
|
||||
<SetProperty Id="CA_PowerShell_Install" Before="CA_PowerShell_Install" Sequence="execute" Value=""[%SystemDrive]\Windows\Sysnative\WindowsPowerShell\v1.0\powershell.exe" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "[INSTALLDIR]config\WAU-MSI_Actions.ps1" "[B_W_LIST_PATH]" -InstallPath "[INSTALLDIR]\" -CurrentDir "[CURRENTDIRECTORY]"" />
|
||||
<SetProperty Id="CA_PowerShell_Uninstall" Before="CA_PowerShell_Uninstall" Sequence="execute" Value=""[%SystemDrive]\Windows\Sysnative\WindowsPowerShell\v1.0\powershell.exe" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "[INSTALLDIR]config\WAU-MSI_Actions.ps1" "[B_W_LIST_PATH]" -InstallPath "[INSTALLDIR]\" -Upgrade "#[UPGRADINGPRODUCTCODE]" -Uninstall" />
|
||||
<SetProperty Id="CA_PowerShell_Install" Before="CA_PowerShell_Install" Sequence="execute" Value=""[POWERSHELLEXE]" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "[INSTALLDIR]config\WAU-MSI_Actions.ps1" "[B_W_LIST_PATH]" -InstallPath "[INSTALLDIR]\" -CurrentDir "[CURRENTDIRECTORY]"" />
|
||||
<SetProperty Id="CA_PowerShell_Uninstall" Before="CA_PowerShell_Uninstall" Sequence="execute" Value=""[POWERSHELLEXE]" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -File "[INSTALLDIR]config\WAU-MSI_Actions.ps1" "[B_W_LIST_PATH]" -InstallPath "[INSTALLDIR]\" -Upgrade "#[UPGRADINGPRODUCTCODE]" -Uninstall" />
|
||||
|
||||
<!-- Custom Actions -->
|
||||
<CustomAction Id="StartWAU" Impersonate="yes" ExeCommand="conhost.exe --headless schtasks /run /tn WAU\Winget-AutoUpdate" Directory="INSTALLDIR" Return="ignore" />
|
||||
<CustomAction Id="CA_PowerShell_Install" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
|
||||
<CustomAction Id="CA_PowerShell_Uninstall" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
|
||||
<CustomAction Id="CA_PowerShell_Install" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" BinaryRef="Wix4UtilCA_X64" />
|
||||
<CustomAction Id="CA_PowerShell_Uninstall" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" BinaryRef="Wix4UtilCA_X64" />
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="StartWAU" After="InstallFinalize" Condition="RUN_WAU="YES"" />
|
||||
<Custom Action="CA_PowerShell_Install" Before="InstallFinalize" Condition="NOT (REMOVE="ALL")" />
|
||||
|
|
Loading…
Reference in New Issue