From 234ce87aab79605ce7a3dad4421bb8dca859f0c4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 13 Nov 2016 20:41:27 +1100 Subject: [PATCH] Ascii: Remove duplicates from get_distro_colors() --- ascii/distro/antergos | 24 +++++------ ascii/distro/arch | 6 +-- ascii/distro/scientific | 4 +- neofetch | 92 ++++++++++------------------------------- 4 files changed, 39 insertions(+), 87 deletions(-) diff --git a/ascii/distro/antergos b/ascii/distro/antergos index 67d1197f..023af9bd 100644 --- a/ascii/distro/antergos +++ b/ascii/distro/antergos @@ -1,19 +1,19 @@ -${c1} `.-/::/-`` +${c2} `.-/::/-`` .-/osssssssso/. :osyysssssssyyys+- `.+yyyysssssssssyyyyy+. `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c2}++${c1}ssosyyyyhhy/` - .ohhhyyyys${c2}o++/+o${c1}so${c2}+${c1}syy${c2}+${c1}shhhho. - .shhhhys${c2}oo++//+${c1}sss${c2}+++${c1}yyy${c2}+s${c1}hhhhs. - -yhhhhs${c2}+++++++o${c1}ssso${c2}+++${c1}yyy${c2}s+o${c1}hhddy: - -yddhhy${c2}o+++++o${c1}syyss${c2}++++${c1}yyy${c2}yooy${c1}hdddy- - .yddddhs${c2}o++o${c1}syyyyys${c2}+++++${c1}yyhh${c2}sos${c1}hddddy` -`odddddhyosyhyyyyyy${c2}++++++${c1}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c2}+++++${c1}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c2}++++++${c1}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c2}++++++${c1}shhhhhddddddmmmmh --dmmmdddddddhhys${c2}o++++o${c1}shhhhdddddddmmmmd- + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- .smmmmddddddddhhhhhhhhhdddddddddmmmms. `+ydmmmdddddddddddddddddddmmmmdy/. `.:+ooyyddddddddddddyyso+:.` diff --git a/ascii/distro/arch b/ascii/distro/arch index 2227dd19..d6fb1977 100644 --- a/ascii/distro/arch +++ b/ascii/distro/arch @@ -7,9 +7,9 @@ ${c1} -` `/:-:++oooo+: `/++++/+++++++: `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` - ./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` + `/+++ooooooooooooo/` + ./ooosssso++osssssso+` + .oossssso-````/ossssss+` -osssssso. :ssssssso. :osssssss/ osssso+++. /ossssssss/ +ssssooo/- diff --git a/ascii/distro/scientific b/ascii/distro/scientific index d5a2e700..82e9553f 100644 --- a/ascii/distro/scientific +++ b/ascii/distro/scientific @@ -7,8 +7,8 @@ M- ,=;;;#:, ,:#;;:=, ,@ :# :#.=/++++/=.$= #= ,#; #/:+/;,,/++:+/ ;+. ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c2}.H${c3}#${c2}#X ${c1}-X :///+; - ;+=;;;.@, ${c3}.X${c2}M${c3}@$. ${c1}=X.//;=#/. + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. ,;: :@#= =$H: .+#- ,#= #;-///==///-// =#, ;+ :#-;;;:;;;;-X- +: diff --git a/neofetch b/neofetch index 7b316be4..9e516b8c 100755 --- a/neofetch +++ b/neofetch @@ -2376,16 +2376,8 @@ get_distro_colors() { # # $ascii_distro is the same as $distro case "$ascii_distro" in - "Arch"*) - set_colors 4 7 - ;; - - "Antergos"*) - set_colors 6 4 - ;; - - "BlankOn"* | "DracOS"*) - set_colors 1 7 + "Arch"* | "Kogaion"* | "Elementary"* | "GalliumOS"* | "Rosa"* | "OpenWrt"* | "Netrunner"* | "PCLinuxOS"* | "Slackware"* | "KaOS"* | "Kubuntu"* | "Lubuntu"* | "Xubuntu"* | "OpenIndiana"* | "Fedora"* | "Korora"* | "Sabayon"* | "Frugalware"* | "Exherbo"* | "Scientific"* | "Solus"*) + set_colors 4 7 1 ;; "CentOS"*) @@ -2401,7 +2393,11 @@ get_distro_colors() { ascii_distro="chrome" ;; - "Debian"* | "Ubuntu"* | "DragonFly"* | "PacBSD"* | "Oracle"*) + "Raspbian"*) + set_colors 2 1 + ;; + + "Debian"* | "Ubuntu"* | "DragonFly"* | "PacBSD"* | "Oracle" | "BlankOn"* | "DracOS"* | "Peppermint"*) set_colors 1 7 3 ;; @@ -2420,27 +2416,6 @@ get_distro_colors() { ascii_distro="redhat" ;; - "Pardus"*) - set_colors 3 7 - ;; - - "Kogaion"* | "Elementary"* | "GalliumOS"* | "Rosa"* | "OpenWrt"* | "Netrunner"*) - set_colors 4 7 - ;; - - "Fedora"* | "Korora"* | "Sabayon"* | "Frugalware"* | "Exherbo"*) - set_colors 4 7 1 - ;; - - "Gentoo"* | "Funtoo"* | "SteamOS"* | "Devuan"*) - set_colors 5 7 - ;; - - "KDE"*) - set_colors 2 7 - ascii_distro="kde" - ;; - "Kali"*) set_colors 4 8 ;; @@ -2458,21 +2433,21 @@ get_distro_colors() { set_colors 4 3 ;; - "Mageia"* | "Porteus"*) - set_colors 6 7 + "NetBSD"* | "Parabola"* | "Tails"* | "BLAG"* | "Gentoo"* | "Funtoo"* | "SteamOS"* | "Devuan"*) + set_colors 5 7 ;; - "Peppermint"*) - set_colors 1 7 + "OpenBSD"* | "GuixSD"* | "Pardus"*) + set_colors 3 7 6 1 8 ;; - *"Mint"*) + *"SUSE"* | "Manjaro"* | "Deepin"* |"LMDE"* | "Chapeau"* | "Bitrig"*) set_colors 2 7 - ascii_distro="mint" ;; - "LMDE"* | "Chapeau"* | "Bitrig"*) + "KDE"*) set_colors 2 7 + ascii_distro="kde" ;; "Android"*) @@ -2480,20 +2455,9 @@ get_distro_colors() { ascii_length_force="19" ;; - "NetBSD"* | "Parabola"* | "Tails"* | "BLAG"*) - set_colors 5 7 - ;; - - "OpenBSD"* | "GuixSD"*) - set_colors 3 7 6 1 8 - ;; - - *"SUSE"* | "Manjaro"* | "Deepin"*) + *"Mint"*) set_colors 2 7 - ;; - - "PCLinuxOS"* | "Slackware"* | "KaOS"* | "Kubuntu"* | "Lubuntu"* | "Xubuntu"* | "OpenIndiana"*) - set_colors 4 7 1 + ascii_distro="mint" ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) @@ -2506,15 +2470,7 @@ get_distro_colors() { ascii_distro="sparky" ;; - "Scientific"*) - set_colors 4 1 7 - ;; - - "Solus"*) - set_colors 4 7 - ;; - - "Trisquel"* | "NixOS"* | "Zorin"*) + "Trisquel"* | "NixOS"* | "Zorin"* | "Antergos"*) set_colors 4 6 ;; @@ -2522,10 +2478,14 @@ get_distro_colors() { set_colors 1 2 3 4 5 6 ;; - "void"*) + "Void"* | "Haiku"*) set_colors 2 8 ;; + "Mageia"* | "Porteus"*) + set_colors 6 7 + ;; + "Windows 8"* | "Windows 10"*) set_colors 6 7 ascii_distro="windows10" @@ -2535,14 +2495,6 @@ get_distro_colors() { set_colors 1 2 4 3 ;; - "Haiku"*) - set_colors 2 0 - ;; - - "Raspbian"*) - set_colors 2 1 - ;; - "Linux") set_colors fg 8 3 ;;