diff --git a/Changelog.md b/Changelog.md index 465ec6b7..77cace69 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,7 +5,6 @@ ## Contributors - ## Info **Distro**
diff --git a/neofetch b/neofetch index a37ba89c..0906b72e 100755 --- a/neofetch +++ b/neofetch @@ -1455,6 +1455,7 @@ getterm() { case "$TERM_PROGRAM" in "iTerm.app") term="iTerm2" ;; "Terminal.app") term="Apple Terminal" ;; + "Hyper") term="HyperTerm" ;; *) term="${TERM_PROGRAM/\.app}" ;; esac return @@ -1534,6 +1535,10 @@ gettermfont() { termfont="${termfont/.pcf}" termfont="${termfont/:*}" ;; + + "Hyper"*) + 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^}" @@ -2302,15 +2307,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}" @@ -2631,7 +2636,7 @@ bold() { # Linebreak {{{ getlinebreak() { - linebreak=" " + linebreak="​ " # Calculate info height info_height="$((info_height+=1))" @@ -3189,7 +3194,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