From 01ce345c33942af2ccb63d267f370ca07af63fd2 Mon Sep 17 00:00:00 2001 From: Adam Jimerson Date: Fri, 5 Aug 2016 16:01:48 -0400 Subject: [PATCH 1/4] Adding PacBSD support to neofetch Signed-off-by: Adam Jimerson --- neofetch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 81ca21f7..f3d3aad5 100755 --- a/neofetch +++ b/neofetch @@ -497,6 +497,9 @@ getdistro () { # Workaround for PCBSD as uname still displays FreeBSD. [ -f "/etc/pcbsd-lang" ] && distro="PCBSD" + + # Workaround for PacBSD as uname displays FreeBSD. + [ -f "/etc/pacbsd-release" ] && distro="PacBSD" ;; "Windows") @@ -692,11 +695,15 @@ getpackages () { ;; "BSD") - if type -p pkg_info >/dev/null 2>&1; then - packages="$(pkg_info | wc -l)" - - elif type -p pkg >/dev/null 2>&1; then - packages="$(pkg info | wc -l)" + # PacBSD has both pacman and pkg, but only pacman is used + if [[ "$distro" == "PacBSD"* ]]; then + packages="$(pacman -Qq --color never | wc -l)" + else + if type -p pkg_info >/dev/null 2>&1; then + packages="$(pkg_info | wc -l)" + elif type -p pkg >/dev/null 2>&1; then + packages="$(pkg info | wc -l)" + fi fi ;; From f310d757d4434272a5bc6959eefd0831217aadf1 Mon Sep 17 00:00:00 2001 From: Adam Jimerson Date: Thu, 11 Aug 2016 06:48:34 -0400 Subject: [PATCH 2/4] Switch from if -> case for BSD package counts Signed-off-by: Adam Jimerson --- neofetch | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index f3d3aad5..d730839a 100755 --- a/neofetch +++ b/neofetch @@ -695,16 +695,18 @@ getpackages () { ;; "BSD") - # PacBSD has both pacman and pkg, but only pacman is used - if [[ "$distro" == "PacBSD"* ]]; then - packages="$(pacman -Qq --color never | wc -l)" - else - if type -p pkg_info >/dev/null 2>&1; then - packages="$(pkg_info | wc -l)" - elif type -p pkg >/dev/null 2>&1; then - packages="$(pkg info | wc -l)" - fi - fi + case "$distro" in + # PacBSD has both pacman and pkg, but only pacman is used + "PacBSD"*) packages="$(pacman -Qq --color never | wc -l)" ;; + + *) + if type -p pkg_info >/dev/null 2>&1; then + packages="$(pkg_info | wc -l)" + elif type -p pkg >/dev/null 2>&1; then + packages="$(pkg info | wc -l)" + fi + ;; + esac ;; "Windows") From acff79ce5eff892d79a05e74abe64d69fc264833 Mon Sep 17 00:00:00 2001 From: Adam Jimerson Date: Thu, 11 Aug 2016 07:29:35 -0400 Subject: [PATCH 3/4] Adding PacBSD acsii art Signed-off-by: Adam Jimerson --- ascii/distro/pacbsd | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 ascii/distro/pacbsd diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd new file mode 100644 index 00000000..ddcba8df --- /dev/null +++ b/ascii/distro/pacbsd @@ -0,0 +1,26 @@ +"\ +${c1} :+sMs. + `:ddNMd- ` -o--` + -sMMMMh: ` ` `+N+`` + yMMMMMs` `.....-/-...`` `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh`` + .hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm-` + :dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` + /dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. + :dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` + :hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// ` + /dMMMMMMMMMMMMMs- ````````..`` ./:` /oooo. -+ooo:` `/ooo.` + .oMMMMMMMMMMMMNs` ./y:` `MMMMM/` `+MMMMNy `hNMMMm: + +dNMMNMMMMMMMmy` ``./ys. omNNm-` -sNNNh/ `+hNNNo. + `/hMMMMMMMMMMMNo-`` `.+yy+-` ``.` ````` ``.`` + `-/hmNMNMMMMMMmmddddhhy/-` ` + `-+oooyMMMdsoo+/:. +" From 8e29d0b3506f4a45c504590f41d23ab566ac8cfc Mon Sep 17 00:00:00 2001 From: Adam Jimerson Date: Thu, 11 Aug 2016 07:56:20 -0400 Subject: [PATCH 4/4] Clean up PacBSD ASCII image Signed-off-by: Adam Jimerson --- ascii/distro/pacbsd | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd index ddcba8df..552a2139 100644 --- a/ascii/distro/pacbsd +++ b/ascii/distro/pacbsd @@ -1,26 +1,26 @@ "\ -${c1} :+sMs. - `:ddNMd- ` -o--` - -sMMMMh: ` ` `+N+`` - yMMMMMs` `.....-/-...`` `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh`` - .hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm-` - :dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` - /dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. - :dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` - :hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// ` - /dMMMMMMMMMMMMMs- ````````..`` ./:` /oooo. -+ooo:` `/ooo.` - .oMMMMMMMMMMMMNs` ./y:` `MMMMM/` `+MMMMNy `hNMMMm: - +dNMMNMMMMMMMmy` ``./ys. omNNm-` -sNNNh/ `+hNNNo. - `/hMMMMMMMMMMMNo-`` `.+yy+-` ``.` ````` ``.`` - `-/hmNMNMMMMMMmmddddhhy/-` ` - `-+oooyMMMdsoo+/:. +${c1} :+sMs. + \`:ddNMd- -o--\` + -sMMMMh: \`+N+\`\` + yMMMMMs\` .....-/-... \`mNh/ + yMMMMMmh+-\`:sdmmmmmmMmmmmddy+-\`\`./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh\` +.hMMMMdhdMMMMMMMMMMMMMMmo \`sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN\`smMNo\` +/dMMMMMMMMMMMMMMMMMMMMMNd/\` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh\` oMMMMMMNo/dMNN\` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++\` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/\` -// + /dMMMMMMMMMMMMMs- \`\`\`\`\`\`\`\`..\`\` + .oMMMMMMMMMMMMNs\` ./y:\` + +dNMMNMMMMMMMmy\` \`\`./ys. + \`/hMMMMMMMMMMMNo-\`\` \`.+yy+-\` + \`-/hmNMNMMMMMMmmddddhhy/-\` \` + \`-+oooyMMMdsoo+/:. "