xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2024-11-14 14:45:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove force install of Winget + Small improvements (#2083)

Browse Source 
* Compile Winutil

* Add Run switch to Run winutil automatically after compilation

* Remove Winutil ForceInstall and unnecessary loading bar

---------

Co-authored-by: Marterich <Marterich@users.noreply.github.com>
This commit is contained in:
Martin Wiethan 2024-06-25 21:10:16 +02:00 committed by GitHub
parent 5dd3bb492f
commit 4958c5efe9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Compile.ps1
View File

@ -1,5 +1,6 @@
param ( param (
[switch]$Debug [switch]$Debug,
[switch]$Run
) )
$OFS = "`r`n" $OFS = "`r`n"
$scriptname = "winutil.ps1" $scriptname = "winutil.ps1"
@ -106,4 +107,8 @@ else {
} }
Set-Content -Path $scriptname -Value ($script_content -join "`r`n") -Encoding ascii Set-Content -Path $scriptname -Value ($script_content -join "`r`n") -Encoding ascii
Write-Progress -Activity "Compiling" -Completed Write-Progress -Activity "Compiling" -Completed
if ($run){
Start-Process -FilePath "powershell" -ArgumentList ".\$scriptname"
}

17
scripts/main.ps1
View File

@ -133,9 +133,17 @@ $sync.keys | ForEach-Object {
# Load computer information in the background # Load computer information in the background
Invoke-WPFRunspace -ScriptBlock { Invoke-WPFRunspace -ScriptBlock {
$sync.ConfigLoaded = $False try{
$sync.ComputerInfo = Get-ComputerInfo $oldProgressPreference = $ProgressPreference
$sync.ConfigLoaded = $True $ProgressPreference = "SilentlyContinue"
$sync.ConfigLoaded = $False
$sync.ComputerInfo = Get-ComputerInfo
$sync.ConfigLoaded = $True
}
finally{
$ProgressPreference = "Continue"
}
} | Out-Null } | Out-Null
#=========================================================================== #===========================================================================
@ -145,9 +153,6 @@ Invoke-WPFRunspace -ScriptBlock {
# Print the logo # Print the logo
Invoke-WPFFormVariables Invoke-WPFFormVariables
# Install Winget if not already present
Install-WinUtilWinget
# Set the titlebar # Set the titlebar
$sync["Form"].title = $sync["Form"].title + " " + $sync.version $sync["Form"].title = $sync["Form"].title + " " + $sync.version
# Set the commands that will run when the form is closed # Set the commands that will run when the form is closed