Skip to content

Commit 4ca0710

Browse files
KnifMeltiKnifMelti
committed
Simplifying
1 parent c6b49c5 commit 4ca0710

File tree

1 file changed

+90
-56
lines changed

1 file changed

+90
-56
lines changed

‎Sources/Winget-AutoUpdate/functions/Update-App.ps1‎

Lines changed: 90 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,53 @@ Function Update-App ($app) {
3131
& "$ModsPreInstall"
3232
}
3333

34-
#Run Winget Upgrade command
35-
if ($ModsOverride) {
36-
Write-ToLog "-> Running (overriding default): Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --override $ModsOverride"
37-
if (Test-Path $CMLogFile) {
38-
& $Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --override $ModsOverride | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append | Tee-Object -file $CMLogFile -Append
39-
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
40-
}
41-
else {
42-
& $Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --override $ModsOverride | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append
43-
}
44-
}
45-
elseif ($ModsCustom) {
46-
Write-ToLog "-> Running (customizing default): Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --custom $ModsCustom"
47-
if (Test-Path $CMLogFile) {
48-
& $Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --custom $ModsCustom | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append | Tee-Object -file $CMLogFile -Append
49-
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
50-
}
51-
else {
52-
& $Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --custom $ModsCustom | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append
53-
}
54-
}
55-
else {
56-
Write-ToLog "-> Running: Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h"
57-
if (Test-Path $CMLogFile) {
58-
& $Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append | Tee-Object -file $CMLogFile -Append
59-
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
60-
}
61-
else {
62-
& $Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append
63-
}
64-
}
34+
# Define upgrade base parameters
35+
$baseParams = @(
36+
"upgrade",
37+
"--id", "$($app.Id)",
38+
"-e",
39+
"--accept-package-agreements",
40+
"--accept-source-agreements",
41+
"-s", "winget"
42+
)
43+
44+
# Define base log message
45+
$baseLogMessage = "Winget upgrade --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget"
46+
47+
# Determine which parameters and log message to use
48+
if ($ModsOverride) {
49+
$allParams = $baseParams + @("--override", "$ModsOverride")
50+
$logPrefix = "Running (overriding default):"
51+
$logSuffix = "--override $ModsOverride"
52+
}
53+
elseif ($ModsCustom) {
54+
$allParams = $baseParams + @("-h", "--custom", "$ModsCustom")
55+
$logPrefix = "Running (customizing default):"
56+
$logSuffix = "-h --custom $ModsCustom"
57+
}
58+
else {
59+
$allParams = $baseParams + @("-h")
60+
$logPrefix = "Running:"
61+
$logSuffix = "-h"
62+
}
63+
64+
# Build the log message
65+
$logMessage = "$logPrefix $baseLogMessage $logSuffix"
66+
67+
# Log the command
68+
Write-ToLog "-> $logMessage"
69+
70+
# Execute command and log results
71+
if (Test-Path $CMLogFile) {
72+
& $Winget $allParams | Where-Object { $_ -notlike " *" } |
73+
Tee-Object -file $LogFile -Append |
74+
Tee-Object -file $CMLogFile -Append
75+
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
76+
}
77+
else {
78+
& $Winget $allParams | Where-Object { $_ -notlike " *" } |
79+
Tee-Object -file $LogFile -Append
80+
}
6581

6682
if ($ModsUpgrade) {
6783
Write-ToLog "Modifications for $($app.Id) during upgrade are being applied..." "DarkYellow"
@@ -86,35 +102,53 @@ Function Update-App ($app) {
86102

87103
Write-ToLog "-> An upgrade for $($app.Name) failed, now trying an install instead... ($retry/2)" "DarkYellow"
88104

105+
# Define install base parameters
106+
$baseParams = @(
107+
"install",
108+
"--id", "$($app.Id)",
109+
"-e",
110+
"--accept-package-agreements",
111+
"--accept-source-agreements",
112+
"-s", "winget",
113+
"--force"
114+
)
115+
116+
# Define base log message
117+
$baseLogMessage = "Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --force"
118+
119+
# Determine which parameters and log message to use
89120
if ($ModsOverride) {
90-
Write-ToLog "-> Running (overriding default): Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --force --override $ModsOverride"
91-
if (Test-Path $CMLogFile) {
92-
& $Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --force --override $ModsOverride | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append | Tee-Object -file $CMLogFile -Append
93-
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
94-
}
95-
else {
96-
& $Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget --force --override $ModsOverride | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append
97-
}
98-
}
121+
$allParams = $baseParams + @("--override", "$ModsOverride")
122+
$logPrefix = "Running (overriding default):"
123+
$logSuffix = "--override $ModsOverride"
124+
}
99125
elseif ($ModsCustom) {
100-
Write-ToLog "-> Running (customizing default): Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --force --custom $ModsCustom"
101-
if (Test-Path $CMLogFile) {
102-
& $Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --force --custom $ModsCustom | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append | Tee-Object -file $CMLogFile -Append
103-
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
104-
}
105-
else {
106-
& $Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --force --custom $ModsCustom | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append
107-
}
126+
$allParams = $baseParams + @("-h", "--custom", "$ModsCustom")
127+
$logPrefix = "Running (customizing default):"
128+
$logSuffix = "-h --custom $ModsCustom"
129+
}
130+
else {
131+
$allParams = $baseParams + @("-h")
132+
$logPrefix = "Running:"
133+
$logSuffix = "-h"
108134
}
135+
136+
# Build the log message
137+
$logMessage = "$logPrefix $baseLogMessage $logSuffix"
138+
139+
# Log the command
140+
Write-ToLog "-> $logMessage"
141+
142+
# Execute command and log results
143+
if (Test-Path $CMLogFile) {
144+
& $Winget $allParams | Where-Object { $_ -notlike " *" } |
145+
Tee-Object -file $LogFile -Append |
146+
Tee-Object -file $CMLogFile -Append
147+
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
148+
}
109149
else {
110-
Write-ToLog "-> Running: Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --force"
111-
if (Test-Path $CMLogFile) {
112-
& $Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --force | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append | Tee-Object -file $CMLogFile -Append
113-
Write-ToLog "-> EOR" "Gray" -LogLevel "0"
114-
}
115-
else {
116-
& $Winget install --id $($app.Id) -e --accept-package-agreements --accept-source-agreements -s winget -h --force | Where-Object { $_ -notlike " *" } | Tee-Object -file $LogFile -Append
117-
}
150+
& $Winget $allParams | Where-Object { $_ -notlike " *" } |
151+
Tee-Object -file $LogFile -Append
118152
}
119153

120154
if ($ModsInstall) {

0 commit comments

Comments
 (0)