From ea0113744a2d8084e7679fc73314a8895e8ac02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20R=C3=BCegsegger?= Date: Tue, 19 Mar 2024 07:51:16 +0100 Subject: [PATCH] fix: indents --- .../mods/_AppID-template.ps1 | 32 +- .../mods/_Mods-Functions.ps1 | 316 +++++++++--------- 2 files changed, 174 insertions(+), 174 deletions(-) diff --git a/Sources/WAU/Winget-AutoUpdate/mods/_AppID-template.ps1 b/Sources/WAU/Winget-AutoUpdate/mods/_AppID-template.ps1 index c20c0df..85b09b7 100644 --- a/Sources/WAU/Winget-AutoUpdate/mods/_AppID-template.ps1 +++ b/Sources/WAU/Winget-AutoUpdate/mods/_AppID-template.ps1 @@ -87,52 +87,52 @@ $User = $True <# MAIN #> if ($RunSystem) { - Invoke-ModsApp $RunSystem $RunSwitch $RunWait "" + Invoke-ModsApp $RunSystem $RunSwitch $RunWait "" } if ($Proc) { - Stop-ModsProc $Proc + Stop-ModsProc $Proc } if ($Svc) { Stop-ModsSvc $Svc } if ($Wait) { - Wait-ModsProc $Wait + Wait-ModsProc $Wait } if ($WingetIDInst) { - Install-WingetID $WingetIDInst + Install-WingetID $WingetIDInst } if ($WingetIDUninst) { - Uninstall-WingetID $WingetIDUninst + Uninstall-WingetID $WingetIDUninst } if ($AppUninst) { - Uninstall-ModsApp $AppUninst $AllVersions + Uninstall-ModsApp $AppUninst $AllVersions } if ($Lnk) { - Remove-ModsLnk $Lnk + Remove-ModsLnk $Lnk } if ($AddKey -and $AddValue -and $AddTypeData -and $AddType) { - Add-ModsReg $AddKey $AddValue $AddTypeData $AddType + Add-ModsReg $AddKey $AddValue $AddTypeData $AddType } if ($DelKey) { - Remove-ModsReg $DelKey $DelValue + Remove-ModsReg $DelKey $DelValue } if ($DelFile) { - Remove-ModsFile $DelFile + Remove-ModsFile $DelFile } if ($RenFile -and $NewName) { - Rename-ModsFile $RenFile $NewName + Rename-ModsFile $RenFile $NewName } if ($CopyFile -and $CopyTo) { - Copy-ModsFile $CopyFile $CopyTo + Copy-ModsFile $CopyFile $CopyTo } if ($File -and $FindText -and $ReplaceText) { - Edit-ModsFile $File $FindText $ReplaceText + Edit-ModsFile $File $FindText $ReplaceText } if ($GrantPath) { - Grant-ModsPath $GrantPath + Grant-ModsPath $GrantPath } if ($RunUser) { - Invoke-ModsApp $RunUser "" "" $User + Invoke-ModsApp $RunUser "" "" $User } -<# EXTRAS #> +<# EXTRAS #> \ No newline at end of file diff --git a/Sources/WAU/Winget-AutoUpdate/mods/_Mods-Functions.ps1 b/Sources/WAU/Winget-AutoUpdate/mods/_Mods-Functions.ps1 index 7d874ee..a7edd0b 100644 --- a/Sources/WAU/Winget-AutoUpdate/mods/_Mods-Functions.ps1 +++ b/Sources/WAU/Winget-AutoUpdate/mods/_Mods-Functions.ps1 @@ -2,18 +2,18 @@ function Invoke-ModsApp ($Run, $RunSwitch, $RunWait, $User) { if (Test-Path "$Run") { - if (!$RunSwitch) { $RunSwitch = " " } - if (!$User) { - if (!$RunWait) { - Start-Process $Run -ArgumentList $RunSwitch + if (!$RunSwitch) { $RunSwitch = " " } + if (!$User) { + if (!$RunWait) { + Start-Process $Run -ArgumentList $RunSwitch + } + else { + Start-Process $Run -ArgumentList $RunSwitch -Wait + } } else { - Start-Process $Run -ArgumentList $RunSwitch -Wait + Start-Process explorer $Run } - } - else { - Start-Process explorer $Run - } } Return } @@ -21,7 +21,7 @@ function Invoke-ModsApp ($Run, $RunSwitch, $RunWait, $User) { function Stop-ModsProc ($Proc) { foreach ($process in $Proc) { - Stop-Process -Name $process -Force -ErrorAction SilentlyContinue | Out-Null + Stop-Process -Name $process -Force -ErrorAction SilentlyContinue | Out-Null } Return } @@ -34,158 +34,158 @@ function Stop-ModsSvc ($Svc) { function Wait-ModsProc ($Wait) { foreach ($process in $Wait) { - Get-Process $process -ErrorAction SilentlyContinue | Foreach-Object { $_.WaitForExit() } + Get-Process $process -ErrorAction SilentlyContinue | Foreach-Object { $_.WaitForExit() } } Return } function Install-WingetID ($WingetIDInst) { foreach ($app in $WingetIDInst) { - & $Winget install --id $app -e --accept-package-agreements --accept-source-agreements -s winget -h + & $Winget install --id $app -e --accept-package-agreements --accept-source-agreements -s winget -h } Return } function Uninstall-WingetID ($WingetIDUninst) { foreach ($app in $WingetIDUninst) { - & $Winget uninstall --id $app -e --accept-source-agreements -s winget -h + & $Winget uninstall --id $app -e --accept-source-agreements -s winget -h } Return } function Uninstall-ModsApp ($AppUninst, $AllVersions) { foreach ($app in $AppUninst) { - $InstalledSoftware = Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall" - foreach ($obj in $InstalledSoftware) { - if ($obj.GetValue('DisplayName') -like $App) { - $UninstallString = $obj.GetValue('UninstallString') - $CleanedUninstallString = $UninstallString.Trim([char]0x0022) - if ($UninstallString -like "MsiExec.exe*") { - $ProductCode = Select-String "{.*}" -inputobject $UninstallString - $ProductCode = $ProductCode.matches.groups[0].value - #MSI x64 Installer - $Exec = Start-Process "C:\Windows\System32\msiexec.exe" -ArgumentList "/x$ProductCode REBOOT=R /qn" -PassThru -Wait - #Stop Hard Reboot (if bad MSI!) - if ($Exec.ExitCode -eq 1641) { - Start-Process "C:\Windows\System32\shutdown.exe" -ArgumentList "/a" - } - } - else { - $QuietUninstallString = $obj.GetValue('QuietUninstallString') - if ($QuietUninstallString) { - $QuietUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $QuietUninstallString - $Command = $QuietUninstallString.matches.groups[1].value - $Parameter = $QuietUninstallString.matches.groups[2].value - #All EXE x64 Installers (already defined silent uninstall) - Start-Process $Command -ArgumentList $Parameter -Wait - } - else { - if ((Test-Path $CleanedUninstallString)) { - $NullSoft = Select-String -Path $CleanedUninstallString -Pattern "Nullsoft" - } - if ($NullSoft) { - #NSIS x64 Installer - Start-Process $UninstallString -ArgumentList "/S" -Wait - } - else { - if ((Test-Path $CleanedUninstallString)) { - $Inno = Select-String -Path $CleanedUninstallString -Pattern "Inno Setup" - } - if ($Inno) { - #Inno x64 Installer - Start-Process $UninstallString -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" -Wait - } - else { - Write-Host "x64 Uninstaller unknown, trying the UninstallString from registry..." - $NativeUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $UninstallString - $Command = $NativeUninstallString.matches.groups[1].value - $Parameter = $NativeUninstallString.matches.groups[2].value - #All EXE x64 Installers (native defined uninstall) - Start-Process $Command -ArgumentList $Parameter -Wait - } - } - } - } - $x64 = $true - if (!$AllVersions) { - break - } - } - } - if (!$x64) { - $InstalledSoftware = Get-ChildItem "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall" + $InstalledSoftware = Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall" foreach ($obj in $InstalledSoftware) { - if ($obj.GetValue('DisplayName') -like $App) { - $UninstallString = $obj.GetValue('UninstallString') - $CleanedUninstallString = $UninstallString.Trim([char]0x0022) - if ($UninstallString -like "MsiExec.exe*") { - $ProductCode = Select-String "{.*}" -inputobject $UninstallString - $ProductCode = $ProductCode.matches.groups[0].value - #MSI x86 Installer - $Exec = Start-Process "C:\Windows\System32\msiexec.exe" -ArgumentList "/x$ProductCode REBOOT=R /qn" -PassThru -Wait - #Stop Hard Reboot (if bad MSI!) - if ($Exec.ExitCode -eq 1641) { - Start-Process "C:\Windows\System32\shutdown.exe" -ArgumentList "/a" - } - } - else { - $QuietUninstallString = $obj.GetValue('QuietUninstallString') - if ($QuietUninstallString) { - $QuietUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $QuietUninstallString - $Command = $QuietUninstallString.matches.groups[1].value - $Parameter = $QuietUninstallString.matches.groups[2].value - #All EXE x86 Installers (already defined silent uninstall) - Start-Process $Command -ArgumentList $Parameter -Wait - } - else { - if ((Test-Path $CleanedUninstallString)) { - $NullSoft = Select-String -Path $CleanedUninstallString -Pattern "Nullsoft" - } - if ($NullSoft) { - #NSIS x86 Installer - Start-Process $UninstallString -ArgumentList "/S" -Wait + if ($obj.GetValue('DisplayName') -like $App) { + $UninstallString = $obj.GetValue('UninstallString') + $CleanedUninstallString = $UninstallString.Trim([char]0x0022) + if ($UninstallString -like "MsiExec.exe*") { + $ProductCode = Select-String "{.*}" -inputobject $UninstallString + $ProductCode = $ProductCode.matches.groups[0].value + #MSI x64 Installer + $Exec = Start-Process "C:\Windows\System32\msiexec.exe" -ArgumentList "/x$ProductCode REBOOT=R /qn" -PassThru -Wait + #Stop Hard Reboot (if bad MSI!) + if ($Exec.ExitCode -eq 1641) { + Start-Process "C:\Windows\System32\shutdown.exe" -ArgumentList "/a" + } } else { - if ((Test-Path $CleanedUninstallString)) { - $Inno = Select-String -Path $CleanedUninstallString -Pattern "Inno Setup" - } - if ($Inno) { - #Inno x86 Installer - Start-Process $UninstallString -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" -Wait - } - else { - Write-Host "x86 Uninstaller unknown, trying the UninstallString from registry..." - $NativeUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $UninstallString - $Command = $NativeUninstallString.matches.groups[1].value - $Parameter = $NativeUninstallString.matches.groups[2].value - #All EXE x86 Installers (native defined uninstall) - Start-Process $Command -ArgumentList $Parameter -Wait - } + $QuietUninstallString = $obj.GetValue('QuietUninstallString') + if ($QuietUninstallString) { + $QuietUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $QuietUninstallString + $Command = $QuietUninstallString.matches.groups[1].value + $Parameter = $QuietUninstallString.matches.groups[2].value + #All EXE x64 Installers (already defined silent uninstall) + Start-Process $Command -ArgumentList $Parameter -Wait + } + else { + if ((Test-Path $CleanedUninstallString)) { + $NullSoft = Select-String -Path $CleanedUninstallString -Pattern "Nullsoft" + } + if ($NullSoft) { + #NSIS x64 Installer + Start-Process $UninstallString -ArgumentList "/S" -Wait + } + else { + if ((Test-Path $CleanedUninstallString)) { + $Inno = Select-String -Path $CleanedUninstallString -Pattern "Inno Setup" + } + if ($Inno) { + #Inno x64 Installer + Start-Process $UninstallString -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" -Wait + } + else { + Write-Host "x64 Uninstaller unknown, trying the UninstallString from registry..." + $NativeUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $UninstallString + $Command = $NativeUninstallString.matches.groups[1].value + $Parameter = $NativeUninstallString.matches.groups[2].value + #All EXE x64 Installers (native defined uninstall) + Start-Process $Command -ArgumentList $Parameter -Wait + } + } + } + } + $x64 = $true + if (!$AllVersions) { + break + } + } + } + if (!$x64) { + $InstalledSoftware = Get-ChildItem "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall" + foreach ($obj in $InstalledSoftware) { + if ($obj.GetValue('DisplayName') -like $App) { + $UninstallString = $obj.GetValue('UninstallString') + $CleanedUninstallString = $UninstallString.Trim([char]0x0022) + if ($UninstallString -like "MsiExec.exe*") { + $ProductCode = Select-String "{.*}" -inputobject $UninstallString + $ProductCode = $ProductCode.matches.groups[0].value + #MSI x86 Installer + $Exec = Start-Process "C:\Windows\System32\msiexec.exe" -ArgumentList "/x$ProductCode REBOOT=R /qn" -PassThru -Wait + #Stop Hard Reboot (if bad MSI!) + if ($Exec.ExitCode -eq 1641) { + Start-Process "C:\Windows\System32\shutdown.exe" -ArgumentList "/a" + } + } + else { + $QuietUninstallString = $obj.GetValue('QuietUninstallString') + if ($QuietUninstallString) { + $QuietUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $QuietUninstallString + $Command = $QuietUninstallString.matches.groups[1].value + $Parameter = $QuietUninstallString.matches.groups[2].value + #All EXE x86 Installers (already defined silent uninstall) + Start-Process $Command -ArgumentList $Parameter -Wait + } + else { + if ((Test-Path $CleanedUninstallString)) { + $NullSoft = Select-String -Path $CleanedUninstallString -Pattern "Nullsoft" + } + if ($NullSoft) { + #NSIS x86 Installer + Start-Process $UninstallString -ArgumentList "/S" -Wait + } + else { + if ((Test-Path $CleanedUninstallString)) { + $Inno = Select-String -Path $CleanedUninstallString -Pattern "Inno Setup" + } + if ($Inno) { + #Inno x86 Installer + Start-Process $UninstallString -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" -Wait + } + else { + Write-Host "x86 Uninstaller unknown, trying the UninstallString from registry..." + $NativeUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $UninstallString + $Command = $NativeUninstallString.matches.groups[1].value + $Parameter = $NativeUninstallString.matches.groups[2].value + #All EXE x86 Installers (native defined uninstall) + Start-Process $Command -ArgumentList $Parameter -Wait + } + } + } + } + if (!$AllVersions) { + break + } } - } } - if (!$AllVersions) { - break - } - } } - } } Return } function Remove-ModsLnk ($Lnk) { foreach ($link in $Lnk) { - Remove-Item -Path "${env:Public}\Desktop\$link.lnk" -Force -ErrorAction SilentlyContinue | Out-Null + Remove-Item -Path "${env:Public}\Desktop\$link.lnk" -Force -ErrorAction SilentlyContinue | Out-Null } Return } function Add-ModsReg ($AddKey, $AddValue, $AddTypeData, $AddType) { if ($AddKey -like "HKEY_LOCAL_MACHINE*") { - $AddKey = $AddKey.replace("HKEY_LOCAL_MACHINE", "HKLM:") + $AddKey = $AddKey.replace("HKEY_LOCAL_MACHINE", "HKLM:") } if (!(Test-Path "$AddKey")) { - New-Item $AddKey -Force -ErrorAction SilentlyContinue | Out-Null + New-Item $AddKey -Force -ErrorAction SilentlyContinue | Out-Null } New-ItemProperty $AddKey -Name $AddValue -Value $AddTypeData -PropertyType $AddType -Force | Out-Null Return @@ -193,72 +193,72 @@ function Add-ModsReg ($AddKey, $AddValue, $AddTypeData, $AddType) { function Remove-ModsReg ($DelKey, $DelValue) { if ($DelKey -like "HKEY_LOCAL_MACHINE*") { - $DelKey = $DelKey.replace("HKEY_LOCAL_MACHINE", "HKLM:") + $DelKey = $DelKey.replace("HKEY_LOCAL_MACHINE", "HKLM:") } if (Test-Path "$DelKey") { - if (!$DelValue) { - Remove-Item $DelKey -Recurse -Force -ErrorAction SilentlyContinue | Out-Null - } - else { - Remove-ItemProperty $DelKey -Name $DelValue -Force -ErrorAction SilentlyContinue | Out-Null - } + if (!$DelValue) { + Remove-Item $DelKey -Recurse -Force -ErrorAction SilentlyContinue | Out-Null + } + else { + Remove-ItemProperty $DelKey -Name $DelValue -Force -ErrorAction SilentlyContinue | Out-Null + } } Return } function Remove-ModsFile ($DelFile) { foreach ($file in $DelFile) { - if (Test-Path "$file") { - Remove-Item -Path $file -Force -Recurse -ErrorAction SilentlyContinue | Out-Null - } + if (Test-Path "$file") { + Remove-Item -Path $file -Force -Recurse -ErrorAction SilentlyContinue | Out-Null + } } Return } function Rename-ModsFile ($RenFile, $NewName) { if (Test-Path "$RenFile") { - Rename-Item -Path $RenFile -NewName $NewName -Force -ErrorAction SilentlyContinue | Out-Null + Rename-Item -Path $RenFile -NewName $NewName -Force -ErrorAction SilentlyContinue | Out-Null } Return } function Copy-ModsFile ($CopyFile, $CopyTo) { if (Test-Path "$CopyFile") { - Copy-Item -Path $CopyFile -Destination $CopyTo -Recurse -Force -ErrorAction SilentlyContinue | Out-Null + Copy-Item -Path $CopyFile -Destination $CopyTo -Recurse -Force -ErrorAction SilentlyContinue | Out-Null } Return } function Edit-ModsFile ($File, $FindText, $ReplaceText) { if (Test-Path "$File") { - ((Get-Content -path $File -Raw) -replace "$FindText", "$ReplaceText") | Set-Content -Path $File -Force -ErrorAction SilentlyContinue | Out-Null + ((Get-Content -path $File -Raw) -replace "$FindText", "$ReplaceText") | Set-Content -Path $File -Force -ErrorAction SilentlyContinue | Out-Null } Return } function Grant-ModsPath ($GrantPath) { foreach ($path in $GrantPath) { - if (Test-Path "$path") { - $NewAcl = Get-Acl -Path $path - $identity = New-Object System.Security.Principal.SecurityIdentifier S-1-5-11 - if ((Get-Item $path) -is [System.IO.DirectoryInfo]) { - $fileSystemAccessRuleArgumentList = $identity, 'Modify', 'ContainerInherit, ObjectInherit', 'None', 'Allow' + if (Test-Path "$path") { + $NewAcl = Get-Acl -Path $path + $identity = New-Object System.Security.Principal.SecurityIdentifier S-1-5-11 + if ((Get-Item $path) -is [System.IO.DirectoryInfo]) { + $fileSystemAccessRuleArgumentList = $identity, 'Modify', 'ContainerInherit, ObjectInherit', 'None', 'Allow' + } + else { + $fileSystemAccessRuleArgumentList = $identity, 'Modify', 'Allow' + } + $fileSystemAccessRule = New-Object -TypeName System.Security.AccessControl.FileSystemAccessRule -ArgumentList $fileSystemAccessRuleArgumentList + $NewAcl.SetAccessRule($fileSystemAccessRule) + + # Grant delete permissions to subfolders and files + $inheritanceFlag = [System.Security.AccessControl.InheritanceFlags]::ContainerInherit -bor [System.Security.AccessControl.InheritanceFlags]::ObjectInherit + $propagationFlag = [System.Security.AccessControl.PropagationFlags]::InheritOnly + $deleteAccessRule = New-Object -TypeName System.Security.AccessControl.FileSystemAccessRule -ArgumentList $identity, 'Delete', $inheritanceFlag, $propagationFlag, 'Allow' + $NewAcl.AddAccessRule($deleteAccessRule) + + + Set-Acl -Path $path -AclObject $NewAcl } - else { - $fileSystemAccessRuleArgumentList = $identity, 'Modify', 'Allow' - } - $fileSystemAccessRule = New-Object -TypeName System.Security.AccessControl.FileSystemAccessRule -ArgumentList $fileSystemAccessRuleArgumentList - $NewAcl.SetAccessRule($fileSystemAccessRule) - - # Grant delete permissions to subfolders and files - $inheritanceFlag = [System.Security.AccessControl.InheritanceFlags]::ContainerInherit -bor [System.Security.AccessControl.InheritanceFlags]::ObjectInherit - $propagationFlag = [System.Security.AccessControl.PropagationFlags]::InheritOnly - $deleteAccessRule = New-Object -TypeName System.Security.AccessControl.FileSystemAccessRule -ArgumentList $identity, 'Delete', $inheritanceFlag, $propagationFlag, 'Allow' - $NewAcl.AddAccessRule($deleteAccessRule) - - - Set-Acl -Path $path -AclObject $NewAcl - } } Return }