screenFetch: update to 3.8.0

This commit is contained in:
Nero 2017-05-21 15:57:41 +00:00
parent 1c413e169d
commit dc068adfeb
2 changed files with 31 additions and 30 deletions

View file

@ -1,6 +1,6 @@
--- ./screenfetch-dev.orig 2015-07-14 08:32:02.000000000 -0400 --- ./screenfetch-dev.orig 2017-03-10 13:55:45.000000000 +0000
+++ ./screenfetch-dev 2015-12-30 17:39:02.668091221 -0500 +++ ./screenfetch-dev 2017-05-21 15:54:48.717974375 +0000
@@ -500,6 +500,11 @@ @@ -587,6 +587,11 @@
distro="Viperr" distro="Viperr"
distro_codename=null distro_codename=null
;; ;;
@ -10,36 +10,37 @@
+ distro_release="" + distro_release=""
+ ;; + ;;
*) *)
;; if [ "x$(printf "${distro_detect}" | od -t x1 | sed -e 's/^\w*\ *//' | tr '\n' ' ' | grep 'eb b6 89 ec 9d 80 eb b3 84 ')" != "x" ]; then
esac distro="Red Star OS"
@@ -558,7 +563,6 @@ @@ -664,7 +669,7 @@
fi fi
# Hotfixes # Hotfixes
- [[ "${distro}" == "Void" || "${distro}" == "void" ]] && distro="Void" - [[ "${distro}" == "void" ]] && distro="Void"
+ [[ "${distro}" == "void" ]] && distro="Void Linux"
[[ "${distro}" == "evolveos" ]] && distro="Evolve OS" [[ "${distro}" == "evolveos" ]] && distro="Evolve OS"
[[ "${distro}" == "antergos" || "${distro}" == "Antergos" ]] && distro="Antergos" [[ "${distro}" == "antergos" ]] && distro="Antergos"
[[ "${distro}" == "logos" || "${distro}" == "Logos" ]] && distro="Logos" [[ "${distro}" == "logos" ]] && distro="Logos"
@@ -757,7 +761,7 @@ @@ -978,7 +983,7 @@
trisquel) distro="Trisquel";; fi
parabolagnu|parabolagnu/linux-libre|'parabola gnu/linux-libre'|parabola) distro="Parabola GNU/Linux-libre" ;; ;;
viperr) distro="Viperr" ;; viperr) distro="Viperr" ;;
- void) distro="Void" ;; - void) distro="Void" ;;
+ void*linux) distro="Void Linux" ;; + void*linux) distro="Void Linux" ;;
kaos) distro="KaOS";; esac
linuxdeepin) distro="LinuxDeepin" ;; verboseOut "Finding distro...found as '${distro} ${distro_release}'"
deepin) distro="Deepin" ;; }
@@ -846,7 +850,7 @@ @@ -1073,7 +1078,7 @@
'Gentoo'|'Sabayon'|'Funtoo') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;; 'Gentoo'|'Sabayon'|'Funtoo'|'Kogaion') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;;
'NixOS') pkgs=$(ls -d -1 /nix/store/*/ | wc -l) ;; 'NixOS') pkgs=$(ls -d -1 /nix/store/*/ | wc -l) ;;
'Fedora'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'Red Hat Enterprise Linux'|'CentOS'|'Mandriva'|'Mandrake'|'Mageia'|'Viperr') pkgs=$(rpm -qa | wc -l) ;; 'Fedora'|'Fux'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'SUSE Linux Enterprise'|'Red Hat Enterprise Linux'|'ROSA'|'Oracle Linux'|'CentOS'|'Mandriva'|'Mandrake'|'Mageia'|'Mer'|'SailfishOS'|'PCLinuxOS'|'Viperr'|'Qubes OS'|'Red Star OS') pkgs=$(rpm -qa | wc -l) ;;
- 'Void') pkgs=$(xbps-query -l | wc -l) ;; - 'Void') pkgs=$(xbps-query -l | wc -l) ;;
+ 'Void Linux') pkgs=$(xbps-query -l | wc -l) ;; + 'Void Linux') pkgs=$(xbps-query -l | wc -l) ;;
'Evolve OS'|'Solus') pkgs=$(pisi list-installed | wc -l) ;; 'Evolve OS'|'Solus') pkgs=$(pisi list-installed | wc -l) ;;
'CRUX') pkgs=$(pkginfo -i | wc -l) ;; 'CRUX') pkgs=$(pkginfo -i | wc -l) ;;
'Lunar Linux') pkgs=$(lvu installed | wc -l) ;; 'Lunar Linux') pkgs=$(lvu installed | wc -l) ;;
@@ -3655,7 +3659,7 @@ @@ -4461,7 +4466,7 @@
"${c1} \`.:+ooyyddddddddddddyyso+:.\`") "${c1} \`.:+ooyyddddddddddddyyso+:.\` %s")
;; ;;
- "Void") - "Void")
@ -47,12 +48,12 @@
if [[ "$no_color" != "1" ]]; then if [[ "$no_color" != "1" ]]; then
c1=$(getColor 'green') # Dark Green c1=$(getColor 'green') # Dark Green
c2=$(getColor 'light green') # Light Green c2=$(getColor 'light green') # Light Green
@@ -3905,7 +3909,7 @@ @@ -5081,7 +5086,7 @@
case ${myascii} in case ${myascii} in
"Arch Linux - Old"|"Fedora"|"Korora"|"Chapeau"|"Mandriva"|"Mandrake"|"Chakra"|"ChromeOS"|"Sabayon"|"Slackware"|"Mac OS X"|"Trisquel"|"Kali Linux"|"Jiyuu Linux"|"Antergos"|"KaOS"|"Logos"|"gNewSense"|"NixOS") labelcolor=$(getColor 'light blue');; "Alpine Linux"|"Arch Linux - Old"|"Fedora"|"Korora"|"Chapeau"|"Mandriva"|"Mandrake"|"Chakra"|"ChromeOS"|"Sabayon"|"Slackware"|"Mac OS X"|"Trisquel"|"Kali Linux"|"Jiyuu Linux"|"Antergos"|"KaOS"|"Logos"|"gNewSense"|"Netrunner"|"NixOS"|"SailfishOS"|"Qubes OS"|"Kogaion"|"PCLinuxOS"|"Obarun"|"Solus"|"SwagArch"|"Parrot Security") labelcolor=$(getColor 'light blue');;
"Arch Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX") labelcolor=$(getColor 'light cyan');; "Arch Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX") labelcolor=$(getColor 'light cyan');;
- "Mint"|"LMDE"|"openSUSE"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void") labelcolor=$(getColor 'light green');; - "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void") labelcolor=$(getColor 'light green');;
+ "Mint"|"LMDE"|"openSUSE"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void Linux") labelcolor=$(getColor 'light green');; + "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void Linux") labelcolor=$(getColor 'light green');;
"Ubuntu"|"FreeBSD"|"FreeBSD - Old"|"Debian"|"Raspbian"|"BSD"|"Red Hat Enterprise Linux"|"Peppermint"|"Cygwin"|"Fuduntu"|"NetBSD"|"Scientific Linux"|"DragonFlyBSD"|"BackTrack Linux") labelcolor=$(getColor 'light red');; "Ubuntu"|"FreeBSD"|"FreeBSD - Old"|"Debian"|"Raspbian"|"BSD"|"Red Hat Enterprise Linux"|"Oracle Linux"|"Peppermint"|"Cygwin"|"Msys"|"Fuduntu"|"Scientific Linux"|"DragonFlyBSD"|"BackTrack Linux"|"Red Star OS"|"SparkyLinux") labelcolor=$(getColor 'light red');;
"CrunchBang"|"Solus"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');; "ROSA") labelcolor=$(getColor 'white');;
"Gentoo"|"Parabola GNU/Linux-libre"|"Funtoo"|"Funtoo-text"|"BLAG") labelcolor=$(getColor 'light purple');; "CrunchBang"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');;

View file

@ -1,7 +1,7 @@
# Template file for 'screenFetch' # Template file for 'screenFetch'
pkgname=screenFetch pkgname=screenFetch
version=3.7.0 version=3.8.0
revision=5 revision=1
noarch=yes noarch=yes
depends="bash xdpyinfo" depends="bash xdpyinfo"
short_desc="Bash screenshot information tool" short_desc="Bash screenshot information tool"
@ -9,7 +9,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-3" license="GPL-3"
homepage="https://github.com/KittyKatt/screenFetch" homepage="https://github.com/KittyKatt/screenFetch"
distfiles="${homepage}/archive/v${version}.tar.gz" distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=6711fe924833919d53c1dfbbb43f3777d33e20357a1b1536c4472f6a1b3c6be0 checksum=248283ee3c24b0dbffb79ed685bdd518554073090c1c167d07ad2a729db26633
do_install() { do_install() {
vbin screenfetch-dev screenfetch vbin screenfetch-dev screenfetch