From 2f0d3db4774a329e0bb2cf43d911fa839466d86b Mon Sep 17 00:00:00 2001 From: walking-octopus <46994949+walking-octopus@users.noreply.github.com> Date: Wed, 27 Jul 2022 19:44:34 +0000 Subject: [PATCH 1/4] Add click to package managers --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 48b96d21..90150e97 100755 --- a/neofetch +++ b/neofetch @@ -1549,6 +1549,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never + has click && tot click list has dpkg && tot dpkg-query -f '.\n' -W has xbps-query && tot xbps-query -l has apk && tot apk info From 957e280bed46f23846e6cf3437fb5fbd3d468979 Mon Sep 17 00:00:00 2001 From: walking-octopus <46994949+walking-octopus@users.noreply.github.com> Date: Wed, 27 Jul 2022 20:40:13 +0000 Subject: [PATCH 2/4] Add Ubuntu Touch support --- neofetch | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 90150e97..e57ef6d2 100755 --- a/neofetch +++ b/neofetch @@ -805,7 +805,7 @@ image_source="auto" # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, +# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu Touch, Ubuntu-MATE, # Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, # Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -1124,6 +1124,14 @@ get_distro() { distro=$(trim_quotes "$distro") distro=${distro/NAME=} + if [[ -f /usr/bin/system-image-cli ]]; then + export ut_ota = $(system-image-cli -i | awk '/version tag:/ { print $3 }'); + distro="Ubuntu Touch $ut_ota"; + + # There's a weird UT bug where the HOSTNAME is set to android. + export HOSTNAME=$(hostname); + fi + # Get Ubuntu flavor. if [[ $distro == "Ubuntu"* ]]; then case $XDG_CONFIG_DIRS in @@ -10940,6 +10948,20 @@ ${c4} `soooo. .oooo` EOF ;; + "Ubuntu Touch"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} + ############### + ## ## + ## ${c2}##${c1} ${c2}##${c1} ## + ## ${c2}##${c1} ${c2}#${c1} ${c2}#${c1} ${c2}##${c1} ## + ## ${c2}###${c1} ## + ## ## + ############### +EOF + ;; + "Ubuntu MATE"* | "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From d2d1c0aab441fc0d59d76f21097179c9c2ae4852 Mon Sep 17 00:00:00 2001 From: walking-octopus <46994949+walking-octopus@users.noreply.github.com> Date: Wed, 27 Jul 2022 21:53:06 +0000 Subject: [PATCH 3/4] Attempt to fix the shellcheck error --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e57ef6d2..898fb85c 100755 --- a/neofetch +++ b/neofetch @@ -1125,11 +1125,11 @@ get_distro() { distro=${distro/NAME=} if [[ -f /usr/bin/system-image-cli ]]; then - export ut_ota = $(system-image-cli -i | awk '/version tag:/ { print $3 }'); + export ut_ota=$(system-image-cli -i | awk '/version tag:/ { print $3 }'); distro="Ubuntu Touch $ut_ota"; # There's a weird UT bug where the HOSTNAME is set to android. - export HOSTNAME=$(hostname); + HOSTNAME=$(hostname); fi # Get Ubuntu flavor. From 69907f6f8b0d4507e8834f6f4d7fe98f3b9499f6 Mon Sep 17 00:00:00 2001 From: walking-octopus <46994949+walking-octopus@users.noreply.github.com> Date: Sat, 30 Jul 2022 16:12:37 +0000 Subject: [PATCH 4/4] Fix the shellcheck error --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 898fb85c..fe8911bb 100755 --- a/neofetch +++ b/neofetch @@ -1125,7 +1125,8 @@ get_distro() { distro=${distro/NAME=} if [[ -f /usr/bin/system-image-cli ]]; then - export ut_ota=$(system-image-cli -i | awk '/version tag:/ { print $3 }'); + local ut_ota + ut_ota=$(system-image-cli -i | awk '/version tag:/ { print $3 }'); distro="Ubuntu Touch $ut_ota"; # There's a weird UT bug where the HOSTNAME is set to android.