From 93c594c838ac6d9bfb7e172caa606d7fc3cb85c9 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 2 Jun 2018 01:11:52 +0200 Subject: [PATCH] New distro: PureOS --- screenfetch-dev | 39 ++++++++++++++++++++++++++++++++------- screenfetch.1 | 4 ++-- update-manpage.sh | 2 +- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 41b6be3..68ff2f6 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -313,12 +313,12 @@ detectColors () { my_hcolor=$(colorNumberToCode "${my_hcolor}") } -supported_distros="ALDOS,Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, \ +supported_distros="ALDOS, Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, \ blackPanther OS, 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, GuixSD, Hyperbola GNU/Linux-libre, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, \ LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, \ -OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, Qubes OS, \ +OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Qubes OS, \ Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, \ SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS." supported_other="Dragonfly/Free/Open/Net BSD, Haiku, Mac OS X, Windows+Cygwin and Windows+MSYS2." @@ -492,7 +492,7 @@ detectdistro () { case "${distro_detect}" in "CentOS"|"Chapeau"|"Deepin"|"Devuan"|"DesaOS"|"Fedora"|"gNewSense"|"Jiyuu Linux"| \ "Kogaion"|"Korora"|"Mageia"|"Netrunner"|"NixOS"|"Pardus"|"Raspbian"|"Sabayon"|"Solus"| \ - "SteamOS"|"Trisquel"|"Ubuntu"|"GrombyangOS"|"Scientific Linux") + "SteamOS"|"Trisquel"|"Ubuntu"|"GrombyangOS"|"Scientific Linux"|"PureOS") # no need to fix $distro/$distro_codename/$distro_release distro="${distro_detect}" ;; @@ -1109,6 +1109,7 @@ detectdistro () { pclinuxos|pclos) distro="PCLinuxOS" ;; peppermint) distro="Peppermint" ;; proxmox|proxmox*ve) distro="Proxmox VE" ;; + pureos) distro="PureOS" ;; qubes) distro="Qubes OS" ;; raspbian) distro="Raspbian" ;; red*hat*|rhel) distro="Red Hat Enterprise Linux" ;; @@ -1229,7 +1230,7 @@ detectpkgs () { 'Frugalware') pkgs=$(pacman-g2 -Q | wc -l) ;; 'Debian'|'Ubuntu'|'Mint'|'Fuduntu'|'KDE neon'|'Devuan'|'OS Elbrus'|'Raspbian'|'LMDE'|'CrunchBang'|'Peppermint'| \ 'LinuxDeepin'|'Deepin'|'Kali Linux'|'Trisquel'|'elementary OS'|'gNewSense'|'BunsenLabs'|'SteamOS'|'Parrot Security'| \ - 'GrombyangOS'|'DesaOS'|'Zorin OS'|'Proxmox VE') pkgs=$(dpkg -l | grep -c ^i) ;; + 'GrombyangOS'|'DesaOS'|'Zorin OS'|'Proxmox VE'|'PureOS') 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) ;; @@ -5451,7 +5452,7 @@ asciiText () { fi if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi startline="1" - logowidth="32" + logowidth="33" fulloutput=("" "${c1} ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ %s" "${c1} ██▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ %s" @@ -5470,6 +5471,30 @@ asciiText () { " %s") ;; + "PureOS") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'dark grey') # "Black" + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="1" + logowidth="44" + fulloutput=("" +" %s" +"${c1} dmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmd %s" +"${c1} dNm//////////////////////////////////mNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNd dNd %s" +"${c1} dNm//////////////////////////////////mNd %s" +"${c1} dmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmd %s" +" %s") + ;; + *) if echo "${kernel}" | grep -q 'Linux'; then if [[ "$no_color" != "1" ]]; then @@ -5704,11 +5729,11 @@ infoDisplay () { "SparkyLinux"|"OBRevenge"|"Source Mage GNU/Linux") labelcolor=$(getColor 'light red');; "ROSA") labelcolor=$(getColor 'white');; "CrunchBang"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');; - "Hyperbola GNU/Linux-libre"|*) labelcolor=$(getColor 'light grey');; + "Hyperbola GNU/Linux-libre"|"PureOS"|*) labelcolor=$(getColor 'light grey');; "Gentoo"|"Parabola GNU/Linux-libre"|"Funtoo"|"Funtoo-text"|"BLAG"|"SteamOS"|"Devuan") labelcolor=$(getColor 'light purple');; "Haiku") labelcolor=$(getColor 'green');; "NetBSD"|"Amazon Linux"|"Proxmox VE") labelcolor=$(getColor 'orange');; - "CentOS"|*) labelcolor=$(getColor 'yellow');; + "CentOS") labelcolor=$(getColor 'yellow');; esac [[ "$my_lcolor" ]] && labelcolor="${my_lcolor}" if [[ "$art" ]]; then source "$art"; fi diff --git a/screenfetch.1 b/screenfetch.1 index ed8cdaa..9edb3bc 100644 --- a/screenfetch.1 +++ b/screenfetch.1 @@ -1,4 +1,4 @@ -.TH SCREENFETCH "1" "August 2017" "3.8.0" "User Commands" +.TH SCREENFETCH "1" "Juni 2018" "3.8.0" "User Commands" .\" Don't remove the lines starting with ».\" @supported_« ! .\" They're important for update-manpage.sh. @@ -21,7 +21,7 @@ This script is very easy to add to and can easily be extended. Supported GNU/Linux Distributions: .IP .\" @supported_distros_start@ -Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, blackPanther OS, 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, GuixSD, Hyperbola GNU/Linux-libre, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, Oracle Linux, OS Elbrus, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS. +ALDOS, Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, blackPanther OS, 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, GuixSD, Hyperbola GNU/Linux-libre, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS. .\" @supported_distros_end@ .PP Other Supported Systems: diff --git a/update-manpage.sh b/update-manpage.sh index 4bb155e..daa33b2 100755 --- a/update-manpage.sh +++ b/update-manpage.sh @@ -17,7 +17,7 @@ grep -v -e '^.TH ' $man.old >> $man for s in supported_distros supported_other supported_dms supported_wms ; do sed -i "/@${s}_start@/,/@${s}_end@/{/@${s}_start@/!{/@${s}_end@/!d}}" $man - list="$(grep "${s}=" $script | cut -d'"' -f2)" + list="$(sed -e :a -e '/\\$/N; s/\\\n//; ta' $script | grep "${s}=" | cut -d'"' -f2)" sed -i "s:@${s}_start@:@${s}_start@\n${list}:" $man done