From af281485d6de6c274f68a0f457b347c4a222f955 Mon Sep 17 00:00:00 2001
From: jschx <git.grz8p@simplelogin.com>
Date: Sat, 26 Sep 2020 09:09:49 -0500
Subject: [PATCH] Strip path from DE/WM/UI

---
 ufetch-alpine     | 1 +
 ufetch-antergos   | 1 +
 ufetch-arch       | 1 +
 ufetch-archbang   | 1 +
 ufetch-arco       | 1 +
 ufetch-artix      | 1 +
 ufetch-centos     | 1 +
 ufetch-crux       | 1 +
 ufetch-debian     | 1 +
 ufetch-devuan     | 1 +
 ufetch-elementary | 1 +
 ufetch-fedora     | 1 +
 ufetch-freebsd    | 1 +
 ufetch-gentoo     | 1 +
 ufetch-gnewsense  | 1 +
 ufetch-guix       | 1 +
 ufetch-hyperbola  | 1 +
 ufetch-linux      | 1 +
 ufetch-linuxlite  | 1 +
 ufetch-macos      | 3 ++-
 ufetch-mageia     | 1 +
 ufetch-manjaro    | 1 +
 ufetch-mint       | 1 +
 ufetch-mx         | 1 +
 ufetch-netbsd     | 1 +
 ufetch-nixos      | 1 +
 ufetch-openbsd    | 1 +
 ufetch-parabola   | 1 +
 ufetch-popos      | 1 +
 ufetch-pureos     | 1 +
 ufetch-raspbian   | 1 +
 ufetch-slackware  | 1 +
 ufetch-suse       | 1 +
 ufetch-ubuntu     | 1 +
 ufetch-void       | 1 +
 ufetch-voyager    | 1 +
 36 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/ufetch-alpine b/ufetch-alpine
index 7bc7997..735ac3c 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-antergos b/ufetch-antergos
index 4b4cc58..f9467a9 100755
--- a/ufetch-antergos
+++ b/ufetch-antergos
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-arch b/ufetch-arch
index e120509..175f644 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-archbang b/ufetch-archbang
index 259aacc..b9b531e 100755
--- a/ufetch-archbang
+++ b/ufetch-archbang
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-arco b/ufetch-arco
index a72d849..8e0da8f 100755
--- a/ufetch-arco
+++ b/ufetch-arco
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-artix b/ufetch-artix
index 84e951f..565c843 100755
--- a/ufetch-artix
+++ b/ufetch-artix
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-centos b/ufetch-centos
index 0ac21d3..53bc0ab 100755
--- a/ufetch-centos
+++ b/ufetch-centos
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-crux b/ufetch-crux
index 1d34dd0..8c5d629 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-debian b/ufetch-debian
index 411acad..786984b 100755
--- a/ufetch-debian
+++ b/ufetch-debian
@@ -42,6 +42,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-devuan b/ufetch-devuan
index 74cb80c..65d5edd 100755
--- a/ufetch-devuan
+++ b/ufetch-devuan
@@ -42,6 +42,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-elementary b/ufetch-elementary
index 680fcc2..c534927 100755
--- a/ufetch-elementary
+++ b/ufetch-elementary
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-fedora b/ufetch-fedora
index 7090d5f..24877ec 100755
--- a/ufetch-fedora
+++ b/ufetch-fedora
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-freebsd b/ufetch-freebsd
index 66d9db2..33a544c 100755
--- a/ufetch-freebsd
+++ b/ufetch-freebsd
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-gentoo b/ufetch-gentoo
index 16dca78..d477f8a 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-gnewsense b/ufetch-gnewsense
index 5e26843..4dd87cd 100755
--- a/ufetch-gnewsense
+++ b/ufetch-gnewsense
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-guix b/ufetch-guix
index 2a5cab5..c4ab79b 100755
--- a/ufetch-guix
+++ b/ufetch-guix
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-hyperbola b/ufetch-hyperbola
index 6dc5202..8471d50 100755
--- a/ufetch-hyperbola
+++ b/ufetch-hyperbola
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-linux b/ufetch-linux
index 9acba11..1879750 100755
--- a/ufetch-linux
+++ b/ufetch-linux
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-linuxlite b/ufetch-linuxlite
index 25b3102..0e4e7d5 100755
--- a/ufetch-linuxlite
+++ b/ufetch-linuxlite
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-macos b/ufetch-macos
index 222fafd..4e578ff 100755
--- a/ufetch-macos
+++ b/ufetch-macos
@@ -5,7 +5,7 @@
 ## INFO
 
 # user is already defined
-host="$(hostname)"
+host="$(hostname -s)"
 os="$(sw_vers -productName) $(sw_vers -productVersion)"
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
@@ -39,6 +39,7 @@ else
 	ui='Aqua'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-mageia b/ufetch-mageia
index c8fe9d3..a36919c 100755
--- a/ufetch-mageia
+++ b/ufetch-mageia
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-manjaro b/ufetch-manjaro
index 664c94a..4bf8055 100755
--- a/ufetch-manjaro
+++ b/ufetch-manjaro
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-mint b/ufetch-mint
index b16c6c8..bbfd4cb 100755
--- a/ufetch-mint
+++ b/ufetch-mint
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-mx b/ufetch-mx
index ae77a1c..1b22b4e 100755
--- a/ufetch-mx
+++ b/ufetch-mx
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-netbsd b/ufetch-netbsd
index f71572d..c45580c 100755
--- a/ufetch-netbsd
+++ b/ufetch-netbsd
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-nixos b/ufetch-nixos
index 9277184..60902f9 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-openbsd b/ufetch-openbsd
index 8a70bc4..b7c8975 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-parabola b/ufetch-parabola
index f2feb90..39ab174 100755
--- a/ufetch-parabola
+++ b/ufetch-parabola
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-popos b/ufetch-popos
index 5a594f9..ac33c1a 100755
--- a/ufetch-popos
+++ b/ufetch-popos
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-pureos b/ufetch-pureos
index 2ff2482..ea460b0 100755
--- a/ufetch-pureos
+++ b/ufetch-pureos
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-raspbian b/ufetch-raspbian
index 4e2df86..52119dd 100755
--- a/ufetch-raspbian
+++ b/ufetch-raspbian
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-slackware b/ufetch-slackware
index 401b99b..f340a2b 100755
--- a/ufetch-slackware
+++ b/ufetch-slackware
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-suse b/ufetch-suse
index 85dc988..6efcd00 100755
--- a/ufetch-suse
+++ b/ufetch-suse
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-ubuntu b/ufetch-ubuntu
index bb75e85..27025d8 100755
--- a/ufetch-ubuntu
+++ b/ufetch-ubuntu
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-void b/ufetch-void
index 7edddaa..8df81fd 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS
 
diff --git a/ufetch-voyager b/ufetch-voyager
index a7c824c..ce07e78 100755
--- a/ufetch-voyager
+++ b/ufetch-voyager
@@ -36,6 +36,7 @@ else
 	ui='unknown'
 	uitype='UI'
 fi
+ui="$(basename ${ui})"
 
 ## DEFINE COLORS