From 2bb7fd9c97c5ac3f613e6886f6e95a350de3d316 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Tue, 2 Mar 2021 22:37:43 +0530
Subject: [PATCH 1/5] Make sane defaults for logo

---
 winfetch.ps1 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/winfetch.ps1 b/winfetch.ps1
index 2462a42..7aabf98 100644
--- a/winfetch.ps1
+++ b/winfetch.ps1
@@ -30,8 +30,8 @@
     Specify a path to a custom config file.
 .PARAMETER noimage
     Do not display any image or logo; display information only.
-.PARAMETER legacylogo
-    Use legacy Windows logo.
+.PARAMETER switchlogo
+    Switch the default Windows logo.
 .PARAMETER blink
     Make the logo blink.
 .PARAMETER stripansi
@@ -65,7 +65,7 @@ param(
     [switch][alias('g')]$genconf,
     [string][alias('c')]$configpath,
     [switch][alias('n')]$noimage,
-    [switch][alias('l')]$legacylogo,
+    [switch][alias('l')]$switchlogo,
     [switch][alias('b')]$blink,
     [switch][alias('s')]$stripansi,
     [switch][alias('a')]$all,
@@ -172,6 +172,10 @@ if ($help) {
 # ===== VARIABLES =====
 $cimSession = New-CimSession
 $t = if ($blink) { "5" } else { "1" }
+$buildVersion = "$([System.Environment]::OSVersion.Version)"
+if ($buildVersion -like "6.1*") { $legacylogo = $true }
+else { $legacylogo = $false }
+if ($switchlogo) { $legacylogo = -not $legacylogo }
 
 
 # ===== CONFIGURATION =====
@@ -208,7 +212,7 @@ $defaultConfig = @'
 # $noimage = $true
 
 # Use legacy Windows logo
-# $legacylogo = $true
+# $switchlogo = $true
 
 # Make the logo blink
 # $blink = $true
@@ -454,14 +458,14 @@ function info_motherboard {
 function info_title {
     return @{
         title   = ""
-        content = "${e}[1;34m{0}${e}[0m@${e}[1;34m{1}${e}[0m" -f [Environment]::UserName,$env:COMPUTERNAME
+        content = "${e}[1;34m{0}${e}[0m@${e}[1;34m{1}${e}[0m" -f [System.Environment]::UserName,$env:COMPUTERNAME
     }
 }
 
 
 # ===== DASHES =====
 function info_dashes {
-    $length = [Environment]::UserName.Length + $env:COMPUTERNAME.Length + 1
+    $length = [System.Environment]::UserName.Length + $env:COMPUTERNAME.Length + 1
     return @{
         title   = ""
         content = "-" * $length
@@ -483,11 +487,7 @@ function info_computer {
 function info_kernel {
     return @{
         title   = "Kernel"
-        content = if ($IsWindows -or $PSVersionTable.PSVersion.Major -eq 5) {
-            "$([System.Environment]::OSVersion.Version)"
-        } else {
-            "$(uname -r)"
-        }
+        content = $buildVersion
     }
 }
 

From e168b3323e8c05e35f8d740a9a1ebda5813e4622 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Tue, 2 Mar 2021 22:53:43 +0530
Subject: [PATCH 2/5] Update config comment

---
 winfetch.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winfetch.ps1 b/winfetch.ps1
index 7aabf98..300d01d 100644
--- a/winfetch.ps1
+++ b/winfetch.ps1
@@ -211,7 +211,7 @@ $defaultConfig = @'
 # $image = "~/winfetch.png"
 # $noimage = $true
 
-# Use legacy Windows logo
+# Switch the default Windows logo
 # $switchlogo = $true
 
 # Make the logo blink

From 887088d842351d0a58343765db6dd0b767517303 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Tue, 2 Mar 2021 23:01:08 +0530
Subject: [PATCH 3/5] Correct statement location

---
 winfetch.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winfetch.ps1 b/winfetch.ps1
index 300d01d..2f48010 100644
--- a/winfetch.ps1
+++ b/winfetch.ps1
@@ -175,7 +175,6 @@ $t = if ($blink) { "5" } else { "1" }
 $buildVersion = "$([System.Environment]::OSVersion.Version)"
 if ($buildVersion -like "6.1*") { $legacylogo = $true }
 else { $legacylogo = $false }
-if ($switchlogo) { $legacylogo = -not $legacylogo }
 
 
 # ===== CONFIGURATION =====
@@ -316,6 +315,7 @@ if ($config.GetType() -eq [string]) {
     $config += @("blank", "colorbar")
 }
 
+if ($switchlogo) { $legacylogo = -not $legacylogo }
 
 # ===== IMAGE =====
 $img = if (-not $noimage) {

From b3d29242f2d932b3c07538e2c152f0946eba1788 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Tue, 2 Mar 2021 23:07:17 +0530
Subject: [PATCH 4/5] Fix blink parameter

---
 winfetch.ps1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/winfetch.ps1 b/winfetch.ps1
index 2f48010..8cecfdd 100644
--- a/winfetch.ps1
+++ b/winfetch.ps1
@@ -171,10 +171,8 @@ if ($help) {
 
 # ===== VARIABLES =====
 $cimSession = New-CimSession
-$t = if ($blink) { "5" } else { "1" }
 $buildVersion = "$([System.Environment]::OSVersion.Version)"
-if ($buildVersion -like "6.1*") { $legacylogo = $true }
-else { $legacylogo = $false }
+$legacylogo = if ($buildVersion -like "6.1*") { $true } else { $false }
 
 
 # ===== CONFIGURATION =====
@@ -315,6 +313,7 @@ if ($config.GetType() -eq [string]) {
     $config += @("blank", "colorbar")
 }
 
+$t = if ($blink) { "5" } else { "1" }
 if ($switchlogo) { $legacylogo = -not $legacylogo }
 
 # ===== IMAGE =====

From f94b96fc4263f43a8d5acc59af28126564546072 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Wed, 3 Mar 2021 19:05:22 +0530
Subject: [PATCH 5/5] Simplify statement

---
 winfetch.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winfetch.ps1 b/winfetch.ps1
index 8cecfdd..a400c8c 100644
--- a/winfetch.ps1
+++ b/winfetch.ps1
@@ -172,7 +172,7 @@ if ($help) {
 # ===== VARIABLES =====
 $cimSession = New-CimSession
 $buildVersion = "$([System.Environment]::OSVersion.Version)"
-$legacylogo = if ($buildVersion -like "6.1*") { $true } else { $false }
+$legacylogo = $buildVersion -like "6.1*"
 
 
 # ===== CONFIGURATION =====