feat: drop 'Install CPU/GPU Drivers Updaters' button, but readd each package to GUI

- Added AMD Ryzen Chipset Driver (via Chocolatey)
2 years ago · 7a96c90593
parent 86ab8e7417
commit 7a96c90593
3 changed files with 42 additions and 72 deletions
--- a/README.md
+++ b/README.md
@ -123,9 +123,6 @@ Set-ExecutionPolicy Unrestricted -Scope CurrentUser -Force; ls -Recurse *.ps*1 |

 ### Software Install

- `Install CPU/GPU Driver Updater`: This **WILL NOT** install anymore the drivers, only the updater to the drivers. ([`install-drivers-updaters.ps1`](./src/scripts/install-drivers-updaters.ps1));
-  - The Latest CPU for driver updater. For `Intel`, `Intel DSA (Winget)` (Except AMD);
-  - The Latest GPU driver updater. For `Intel (DSA)` and `NVIDIA`, `NVIDIA GeForce Experience (Winget)` (Except AMD);
 - `Install Gaming Dependencies`: Install all Gaming Dependencies required to play games (DirectX, VC++ 2005+ (x86 & x64), .NET Framework). ([`install-gaming-dependencies.ps1`](./src/scripts/install-gaming-dependencies.ps1));
 - `Install Selected`: Install the selected apps by marking the checkbox(es);
 - `Uninstall Mode`: Default as OFF, clicking this will switch the `Install Selected` button to `Uninstall Selected` and uninstall every selected apps (**Advice**: Blue colored buttons may not be able to uninstall completely and WSL UWP Apps, but WSL Distros will be unregistered);
--- a/Win10ScriptGUI.ps1
+++ b/Win10ScriptGUI.ps1
@ -49,6 +49,12 @@ function Show-GUI() {
    $WinBlue = "#08ABF7"
    $WinDark = "#252525"

+    # Miscellaneous colors
+
+    $AmdRyzenPrimaryColor = "#E4700D"
+    $IntelPrimaryColor = "#0071C5"
+    $NVIDIAPrimaryColor = "#76B900"
+
    $CaptionLabelWidth = $PanelWidth - ($PanelWidth - $ButtonWidth) # & $CaptionLabelHeight
    $BBHeight = ($ButtonHeight * 2) + $DistanceBetweenButtons

@ -148,9 +154,21 @@ function Show-GUI() {
    $CbShutdownPCShortcut = New-CheckBox -Text "Enable Shutdown PC shortcut" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation

    # ==> Panel 3
-    $InstallDrivers = New-Button -Text "Install CPU/GPU Drivers Updaters" -Width $ButtonWidth -Height $BBHeight -LocationX $ButtonX -LocationY $FirstButtonY -FontSize $Header3 -ForeColor $WinBlue
+    $ClCpuGpuDrivers = New-Label -Text "CPU/GPU Drivers" -Width $CaptionLabelWidth -Height $CaptionLabelHeight -LocationX $ButtonX -LocationY $FirstButtonY
+
+    $NextYLocation = $ClCpuGpuDrivers.Location.Y + $ButtonHeight + $DistanceBetweenButtons
+    $InstallAmdRyzenChipsetDriver = New-CheckBox -Text "AMD Ryzen Chipset Driver" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation -ForeColor $AmdRyzenPrimaryColor
+
+    $NextYLocation = $InstallAmdRyzenChipsetDriver.Location.Y + $InstallAmdRyzenChipsetDriver.Height + $DistanceBetweenButtons
+    $InstallIntelDSA = New-CheckBox -Text "Intel® DSA" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation -ForeColor $IntelPrimaryColor

-    $NextYLocation = $InstallDrivers.Location.Y + $InstallDrivers.Height + $DistanceBetweenButtons
+    $NextYLocation = $InstallIntelDSA.Location.Y + $InstallIntelDSA.Height + $DistanceBetweenButtons
+    $InstallNvidiaGeForceExperience = New-CheckBox -Text "NVIDIA GeForce Experience" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation -ForeColor $NVIDIAPrimaryColor
+
+    $NextYLocation = $InstallNvidiaGeForceExperience.Location.Y + $InstallNvidiaGeForceExperience.Height + $DistanceBetweenButtons
+    $InstallNVCleanstall = New-CheckBox -Text "NVCleanstall" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation
+
+    $NextYLocation = $InstallNVCleanstall.Location.Y + $InstallNVCleanstall.Height + $DistanceBetweenButtons
    $ClWebBrowsers = New-Label -Text "Web Browsers" -Width $CaptionLabelWidth -Height $CaptionLabelHeight -LocationX $ButtonX -LocationY $NextYLocation

    $NextYLocation = $ClWebBrowsers.Location.Y + $ButtonHeight + $DistanceBetweenButtons
@ -343,9 +361,6 @@ function Show-GUI() {
    $InstallHwInfo = New-CheckBox -Text "HWiNFO" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation

    $NextYLocation = $InstallHwInfo.Location.Y + $InstallHwInfo.Height + $DistanceBetweenButtons
-    $InstallNVCleanstall = New-CheckBox -Text "NVCleanstall" -Width $ButtonWidth -Height $ButtonHeight -LocationX $ButtonX -LocationY $NextYLocation
-
-    $NextYLocation = $InstallNVCleanstall.Location.Y + $InstallNVCleanstall.Height + $DistanceBetweenButtons
    $ClCloudStorage = New-Label -Text "Cloud Storage" -Width $CaptionLabelWidth -Height $CaptionLabelHeight -LocationX $ButtonX -LocationY $NextYLocation

    $NextYLocation = $ClCloudStorage.Location.Y + $ButtonHeight + $DistanceBetweenButtons
@ -565,7 +580,7 @@ function Show-GUI() {
    $Panel2.Controls.AddRange(@($TitleLabel2, $ClCustomizableFeatures))
    $Panel2.Controls.AddRange(@($CbDarkTheme, $CbActivityHistory, $CbBackgroundsApps, $CbClipboardHistory, $CbCortana, $CbOldVolumeControl, $CbSearchIdx, $CbTelemetry, $CbXboxGameBarAndDVR))
    $Panel2.Controls.AddRange(@($ClMiscFeatures, $CbGodMode, $CbTakeOwnership, $CbShutdownPCShortcut))
-    $Panel3.Controls.AddRange(@($InstallDrivers))
+    $Panel3.Controls.AddRange(@($ClCpuGpuDrivers, $InstallAmdRyzenChipsetDriver, $InstallIntelDSA, $InstallNvidiaGeForceExperience, $InstallNVCleanstall))
    $Panel3.Controls.AddRange(@($ClWebBrowsers, $InstallBraveBrowser, $InstallGoogleChrome, $InstallMozillaFirefox))
    $Panel3.Controls.AddRange(@($ClFileCompression, $Install7Zip, $InstallWinRar))
    $Panel3.Controls.AddRange(@($ClDocuments, $InstallAdobeReaderDC, $InstallLibreOffice, $InstallOnlyOffice, $InstallPowerBi, $InstallSumatraPDF))
@ -576,7 +591,7 @@ function Show-GUI() {
    $Panel4.Controls.AddRange(@($TitleLabel3, $InstallSelected, $UninstallMode))
    $Panel4.Controls.AddRange(@($ClAudioVideoTools, $InstallAudacity, $InstallMpcHc, $InstallSpotify, $InstallVlc))
    $Panel4.Controls.AddRange(@($ClImageTools, $InstallGimp, $InstallInkscape, $InstallIrfanView, $InstallKrita, $InstallPaintNet, $InstallShareX))
-    $Panel4.Controls.AddRange(@($ClUtilities, $InstallCpuZ, $InstallCrystalDiskInfo, $InstallCrystalDiskMark, $InstallGpuZ, $InstallNVCleanstall, $InstallHwInfo))
+    $Panel4.Controls.AddRange(@($ClUtilities, $InstallCpuZ, $InstallCrystalDiskInfo, $InstallCrystalDiskMark, $InstallGpuZ, $InstallHwInfo))
    $Panel4.Controls.AddRange(@($ClCloudStorage, $InstallDropbox, $InstallGoogleDrive))
    $Panel4.Controls.AddRange(@($ClPlanningProductivity, $InstallNotion, $InstallObsidian))
    $Panel4.Controls.AddRange(@($ClNetworkManagement, $InstallHamachi, $InstallPuTty, $InstallRadminVpn, $InstallWinScp, $InstallWireshark))
@ -786,10 +801,6 @@ function Show-GUI() {
            }
        })

-    $InstallDrivers.Add_Click( {
-            Open-PowerShellFilesCollection -RelativeLocation "src\scripts" -Scripts @("install-drivers-updaters.ps1") -DoneTitle $DoneTitle -DoneMessage $DoneMessage
-        })
-
    $InstallGamingDependencies.Add_Click( {
            Open-PowerShellFilesCollection -RelativeLocation "src\scripts" -Scripts @("install-gaming-dependencies.ps1") -DoneTitle $DoneTitle -DoneMessage $DoneMessage
        })
@ -803,6 +814,26 @@ function Show-GUI() {
            }

            # ==> Panel 3
+            If ($InstallAmdRyzenChipsetDriver.CheckState -eq "Checked") {
+                $AppsSelected.ChocolateyApps.Add("amd-ryzen-chipset")
+                $InstallAmdRyzenChipsetDriver.CheckState = "Unchecked"
+            }
+
+            If ($InstallIntelDSA.CheckState -eq "Checked") {
+                $AppsSelected.WingetApps.Add("Intel.IntelDriverAndSupportAssistant")
+                $InstallIntelDSA.CheckState = "Unchecked"
+            }
+
+            If ($InstallNvidiaGeForceExperience.CheckState -eq "Checked") {
+                $AppsSelected.WingetApps.Add("Nvidia.GeForceExperience")
+                $InstallNvidiaGeForceExperience.CheckState = "Unchecked"
+            }
+
+            If ($InstallNVCleanstall.CheckState -eq "Checked") {
+                $AppsSelected.WingetApps.Add("TechPowerUp.NVCleanstall")
+                $InstallNVCleanstall.CheckState = "Unchecked"
+            }
+
            If ($InstallBraveBrowser.CheckState -eq "Checked") {
                $AppsSelected.WingetApps.Add("BraveSoftware.BraveBrowser")
                $InstallBraveBrowser.CheckState = "Unchecked"
@ -1071,11 +1102,6 @@ function Show-GUI() {
                $InstallHwInfo.CheckState = "Unchecked"
            }

-            If ($InstallNVCleanstall.CheckState -eq "Checked") {
-                $AppsSelected.WingetApps.Add("TechPowerUp.NVCleanstall")
-                $InstallNVCleanstall.CheckState = "Unchecked"
-            }
-
            If ($InstallDropbox.CheckState -eq "Checked") {
                $AppsSelected.WingetApps.Add("Dropbox.Dropbox")
                $InstallDropbox.CheckState = "Unchecked"
--- a/src/scripts/install-drivers-updaters.ps1
+++ b/src/scripts/install-drivers-updaters.ps1
@ -1,53 +0,0 @@
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"get-hardware-info.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"show-dialog-window.psm1"
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\"title-templates.psm1"
-
-function Install-DriverUpdater() {
-    # Check for CPU drivers
-    If ($CPU.contains("AMD")) {
-        Write-Section -Text "Installing AMD $CPU chipset drivers updaters!"
-        Write-Host "Search for $CPU chipset driver on the AMD website." -ForegroundColor Yellow -BackgroundColor Black
-        Write-Host "This will only download an updater if AMD makes one." -ForegroundColor Yellow -BackgroundColor Black
-    }
-    ElseIf ($CPU.contains("Intel")) {
-        Write-Section -Text "Installing Intel $CPU chipset drivers updaters!"
-        Install-Software -Name "Intel® Driver & Support Assistant (Intel® DSA)" -Packages "Intel.IntelDriverAndSupportAssistant" -NoDialog # Intel® Driver & Support Assistant (Intel® DSA)
-    }
-
-    # Check for GPU drivers then
-    If ($GPU.contains("AMD") -or $GPU.contains("Radeon")) {
-        Write-Title -Text "AMD $GPU GPU, you will have to install Manually!"
-        Write-Host "Search for $GPU Graphics driver on the AMD website." -ForegroundColor Yellow -BackgroundColor Black
-        Write-Host "This will only download an updater if AMD makes one." -ForegroundColor Yellow -BackgroundColor Black
-    }
-
-    If ($GPU.contains("Intel")) {
-        Write-Section -Text "Intel $GPU Graphics driver updater already included!"
-        Install-Software -Name "Intel® Driver & Support Assistant (Intel® DSA)" -Packages "Intel.IntelDriverAndSupportAssistant" -NoDialog # Intel® Driver & Support Assistant (Intel® DSA)
-    }
-
-    If ($GPU.contains("NVIDIA")) {
-        Write-Section -Text "NVIDIA $GPU Graphics driver updater!"
-        Install-Software -Name "NVIDIA GeForce Experience" -Packages "Nvidia.GeForceExperience" -NoDialog # NVIDIA GeForce Experience
-    }
-}
-
-function Main() {
-    $CPU = Get-CPU -NameOnly # Detects the current CPU
-    $GPU = Get-GPU           # Detects the current GPU
-    $Ask = "Do you want to install CPU/GPU drivers?`nAll the following Driver Updaters will be installed (if found):`n`n- $CPU`n- $GPU"
-
-    switch (Show-Question -Title "Warning" -Message $Ask) {
-        'Yes' {
-            Install-DriverUpdater # Install CPU & GPU Drivers (If applicable)
-        }
-        'No' {
-            Write-Host "Aborting..."
-        }
-        'Cancel' {
-            Write-Host "Aborting..." # With Yes, No and Cancel, the user can press Esc to exit
-        }
-    }
-}
-
-Main