From 564b0f889e7cdc1396c98421cbdc9769d12a0038 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Nov 2016 18:45:02 +1100 Subject: [PATCH 1/8] Docs: Change version --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 14ceea32..56a03667 100755 --- a/neofetch +++ b/neofetch @@ -3195,7 +3195,7 @@ getargs() { -v) verbose="on" ;; -vv) set -x; verbose="on" ;; --help) usage ;; - --version) printf "%s\n" "Neofetch 2.0"; exit ;; + --version) printf "%s\n" "Neofetch 1.9.1"; exit ;; esac shift diff --git a/neofetch.1 b/neofetch.1 index 72816069..cbbb5377 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,4 +1,4 @@ -.TH NEOFETCH "1" "June 2016" "2.0" "User Commands" +.TH NEOFETCH "1" "November 2016" "1.9.1" "User Commands" .SH NAME neofetch \- simple system information script From a2cad033d2f3932a149d6256030621e95b839f58 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Nov 2016 18:49:51 +1100 Subject: [PATCH 2/8] Changelog: Clear changelog --- Changelog.md | 66 ---------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/Changelog.md b/Changelog.md index 36a93e27..e9652019 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,68 +1,2 @@ ## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@fornwall](https://github.com/fornwall)** -- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - -## Packages - -- Neofetch is now in Termux`s repos. - - -## General - -- [Cursor Position] Fix cursor position in URxvt when using terminal padding. -- [Termux] Fix default ascii location. **[@konimex](https://github.com/konimex)** -- [Termux] Fix default config location. **[@fornwall](https://github.com/fornwall)** -- If a function fails to detect info, let the user know in verbose mode. (`-v`) -- Removed `--test` in favor of a separate config file. Travis.ci now uses `neofetch --config travis` instead of a hacked together arg. - - -## Operating System - -- Added support for BlankOn Linux. - - -## Images - -- Fix division by 0 error. - - -## Ascii - -- [Tails] Update ascii art. -- [OpenBSD] Made ascii art thinner - - -## Info - -**Prin**
- -- Fix color breakage. -- Fix bold not working. - - -**Terminal**
- -- Fix whitespace error. - - -**Terminal Font**
- -- [Termite] Fix incorrect Termite font chosen. -- [Termite] Simplify `awk` command. -- [xfce4-terminal] Simplify `awk` command. - - -**Theme**
- -- [Budgie] Fix incorrect GTK Theme/Icons - - -**Window Manager Theme**
- -- [Budgie (Mutter)] Don't print WM Theme. - -**Memory**
- -- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** From 7fbe91e8e890e67726c4159178a723750206236d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Nov 2016 20:09:27 +1100 Subject: [PATCH 3/8] General: Fix issue with no info printed if whitespace was in the output --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 56a03667..13b05887 100755 --- a/neofetch +++ b/neofetch @@ -2308,15 +2308,15 @@ info() { eval output="\$${2}" fi + # Trim whitespace + output="$(trim "$output")" + # If the output is empty, don't print anything if [ -z "$output" ]; then err "Info: Couldn't detect $subtitle" return fi - # Trim whitespace - output="$(trim "$output")" - case "$1" in title) string="${title_color}${bold}${output}" @@ -2637,7 +2637,7 @@ bold() { # Linebreak {{{ getlinebreak() { - linebreak=" " + linebreak="​ " # Calculate info height info_height="$((info_height+=1))" From fa1a14f8f5fa05936d540cee478e5e5034fb989d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Nov 2016 20:10:16 +1100 Subject: [PATCH 4/8] Changelog --- Changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changelog.md b/Changelog.md index e9652019..1b4c7c73 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,2 +1,6 @@ ## Contributors +## General + +- Fixed issue where info wasn't detected properly but the subtitle was still displayed. + From a63a6a6b1de0e614db373e7bbeeb90790f1be086 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Fri, 4 Nov 2016 17:44:12 -0400 Subject: [PATCH 5/8] macOS Sierra (HyperTerm): Add terminal detection --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 13b05887..05a1b3cd 100755 --- a/neofetch +++ b/neofetch @@ -1461,6 +1461,7 @@ getterm() { case "$TERM_PROGRAM" in "iTerm.app") term="iTerm2" ;; "Terminal.app") term="Apple Terminal" ;; + "Hyper") term="HyperTerm" ;; *) term="${TERM_PROGRAM/\.app}" ;; esac return From 1830f9651bda5e6ccc9a0f045496a1ad1f56dc47 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Fri, 4 Nov 2016 17:44:44 -0400 Subject: [PATCH 6/8] macOS Sierra (HyperTerm): Add termfont detection --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 05a1b3cd..7047a54b 100755 --- a/neofetch +++ b/neofetch @@ -1541,6 +1541,10 @@ gettermfont() { termfont="${termfont/.pcf}" termfont="${termfont/:*}" ;; + + "HyperTerm") + termfont="$(awk -F "," '/fontFamily/ {a=$1} END{print a}' "${HOME}/.hyper.js" | awk -F "'" '{a=$2} END{print a}')" + ;; esac [ "$version" -ge 4 ] && termfont="${termfont^}" From 3d40df4338d9b69e6919a7d13ee8b1eca40d3d9b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 Nov 2016 09:09:10 +1100 Subject: [PATCH 7/8] Changelog --- Changelog.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Changelog.md b/Changelog.md index 1b4c7c73..bfe37361 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,22 @@ ## Contributors +- **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + + ## General - Fixed issue where info wasn't detected properly but the subtitle was still displayed. + + +## Info + +**Terminal**
+ +- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + + +**Terminal Font**
+ +- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + From a14cba706888b3947187e37cb771dfb005c87166 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 Nov 2016 09:52:11 +1100 Subject: [PATCH 8/8] Terminal Font: Add HyperTerm support --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7047a54b..c1258f32 100755 --- a/neofetch +++ b/neofetch @@ -1542,7 +1542,7 @@ gettermfont() { termfont="${termfont/:*}" ;; - "HyperTerm") + "Hyper"*) termfont="$(awk -F "," '/fontFamily/ {a=$1} END{print a}' "${HOME}/.hyper.js" | awk -F "'" '{a=$2} END{print a}')" ;; esac