From 92ec351ac3abf02b641735f310ba43072075fb0f Mon Sep 17 00:00:00 2001 From: razaqultegar Date: Sun, 9 Apr 2017 20:23:53 +0700 Subject: [PATCH] Fix ASCII Logo DesaOS Linux --- screenfetch-dev | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 27f9f02..90dac55 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -227,7 +227,7 @@ detectColors () { my_hcolor=$(colorNumberToCode "${my_hcolor}") } -supported_distros="Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Fux, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr and Void." +supported_distros="Alpine Linux, Antergos, Arch Linux (Old and Current Logos), BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, DesaOS,Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Fux, Gentoo, gNewSense, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, openSUSE, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Slackware, Solus, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr and Void." supported_other="Dragonfly/Free/Open/Net BSD, Haiku, Mac OS X, Windows+Cygwin and Windows+MSYS2." supported_dms="KDE, GNOME, Unity, Xfce, LXDE, Cinnamon, MATE, Deepin, CDE, RazorQt and Trinity." supported_wms="2bwm, 9wm, Awesome, Beryl, Blackbox, Cinnamon, chromeos-wm, Compiz, deepin-wm, dminiwm, dwm, dtwm, E16, E17, echinus, Emerald, FluxBox, FLWM, FVWM, herbstluftwm, howm, IceWM, KWin, Metacity, monsterwm, Musca, Gala, Mutter, Muffin, Notion, OpenBox, PekWM, Ratpoison, Sawfish, ScrotWM, SpectrWM, StumpWM, subtle, sway, TWin, WindowMaker, WMFS, wmii, Xfwm4, XMonad and i3." @@ -389,7 +389,7 @@ detectdistro () { done fi case "${distro_detect}" in - "CentOS"|"Chapeau"|"Deepin"|"Devuan"|"Fedora"|"gNewSense"|"Jiyuu Linux"|"Kogaion"|"Korora"|"Mageia"|"Netrunner"|"NixOS"|"Pardus"|"Raspbian"|"Sabayon"|"Solus"|"SteamOS"|"Trisquel"|"Ubuntu"|"GrombyangOS"|"Scientific Linux") + "CentOS"|"Chapeau"|"Deepin"|"Devuan"|"DesaOS"|"Fedora"|"gNewSense"|"Jiyuu Linux"|"Kogaion"|"Korora"|"Mageia"|"Netrunner"|"NixOS"|"Pardus"|"Raspbian"|"Sabayon"|"Solus"|"SteamOS"|"Trisquel"|"Ubuntu"|"GrombyangOS"|"Scientific Linux") # no need to fix $distro/$distro_codename/$distro_release distro="${distro_detect}" ;; @@ -909,6 +909,7 @@ detectdistro () { debian) distro="Debian" ;; devuan) distro="Devuan" ;; deepin) distro="Deepin" ;; + desaos) distro="DesaOS" ;; dragonflybsd) distro="DragonFlyBSD" ;; dragora) distro="Dragora" ;; elementary|'elementary os') distro="elementary OS";; @@ -1068,7 +1069,7 @@ detectpkgs () { ;; 'Dragora') pkgs=$(ls -1 /var/db/pkg | wc -l) ;; 'Frugalware') pkgs=$(pacman-g2 -Q | wc -l) ;; - 'Debian'|'Ubuntu'|'Mint'|'Fuduntu'|'KDE neon'|'Devuan'|'Raspbian'|'LMDE'|'CrunchBang'|'Peppermint'|'LinuxDeepin'|'Deepin'|'Kali Linux'|'Trisquel'|'elementary OS'|'gNewSense'|'BunsenLabs'|'SteamOS'|'Parrot Security'|'GrombyangOS') pkgs=$(dpkg -l | grep -c ^i) ;; + 'Debian'|'Ubuntu'|'Mint'|'Fuduntu'|'KDE neon'|'Devuan'|'Raspbian'|'LMDE'|'CrunchBang'|'Peppermint'|'LinuxDeepin'|'Deepin'|'Kali Linux'|'Trisquel'|'elementary OS'|'gNewSense'|'BunsenLabs'|'SteamOS'|'Parrot Security'|'GrombyangOS'| 'DesaOS') pkgs=$(dpkg -l | grep -c ^i) ;; 'Slackware') pkgs=$(ls -1 /var/log/packages | wc -l) ;; 'Gentoo'|'Sabayon'|'Funtoo'|'Kogaion') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;; 'NixOS') pkgs=$(ls -d -1 /nix/store/*/ | wc -l) ;; @@ -2977,6 +2978,33 @@ asciiText () { "${c1} ..,:${c3}dOkxl:. %s") ;; + "DesaOS") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'light green') #Hijau + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="0" + logowidth="33" + fulloutput=( +"${c1} ███████████████████████ %s" +"${c1} ███████████████████████ %s" +"${c1} ███████████████████████ %s" +"${c1} ███████████████████████ %s" +"${c1} ████████ ███████ %s" +"${c1} ████████ ███████ %s" +"${c1} ████████ ███████ %s" +"${c1} ████████ ███████ %s" +"${c1} ████████ ███████ %s" +"${c1} ████████ ███████ %s" +"${c1} ████████ ███████ %s" +"${c1} ██████████████████████████████ %s" +"${c1} ██████████████████████████████ %s" +"${c1} ████████████████████████ %s" +"${c1} ████████████████████████ %s" +"${c1} ████████████████████████ %s" +" %s") + ;; + "Gentoo") if [[ "$no_color" != "1" ]]; then c1=$(getColor 'white') # White @@ -3102,7 +3130,7 @@ asciiText () { if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi startline="0" fulloutput=( -"${c2} --/+osssso+/-- %s" +"${c2} --/+osssso+/-- %s" "${c2} -/oshhhhhhhhhhhhso/- %s" "${c2} :oyhhhhhso+//+oshhhhhso: %s" "${c2} -+yhhhh+. ss+/ .+hhhhs+- %s" @@ -3598,10 +3626,10 @@ asciiText () { "${c2} NZZZZZZZZZZZ${c1}MMMMM %s" "${c2} ZZZZZZZZZ${c1}MM %s") ;; - + "Grombyang"|"GrombyangOS") if [[ "$no_color" != "1" ]]; then - c1=$(getColor 'light blue') + c1=$(getColor 'light blue') c2=$(getColor 'light green') c3=$(getColor 'light red') fi @@ -3627,7 +3655,7 @@ asciiText () { "${c1} eeeeeeeeeeeeeeeeeeeeeee %s" "${c1} eeeeeeeeeeeeeeeee %s" " %s" -" %s") +" %s") ;; "Solus") @@ -4052,7 +4080,7 @@ asciiText () { "${c2} ████▄ ██▄▄▄ ███ %s" "${c2} █████▄ ▀▀ ▄██ %s" "${c2} ██████▄▄▄████ %s" -"${c2} ▀▀█████▀▀ %s") +"${c2} █████▀▀ %s") ;; "Manjaro") @@ -5081,7 +5109,7 @@ infoDisplay () { case ${myascii} in "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');; - "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"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"|"DesaOS") labelcolor=$(getColor 'light green');; "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');; "ROSA") labelcolor=$(getColor 'white');; "CrunchBang"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');;