Merge master
This commit is contained in:
commit
040a964833
3 changed files with 11 additions and 7 deletions
|
@ -5,7 +5,6 @@
|
||||||
## Contributors
|
## Contributors
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Info
|
## Info
|
||||||
|
|
||||||
**Distro**<br \>
|
**Distro**<br \>
|
||||||
|
|
15
neofetch
15
neofetch
|
@ -1455,6 +1455,7 @@ getterm() {
|
||||||
case "$TERM_PROGRAM" in
|
case "$TERM_PROGRAM" in
|
||||||
"iTerm.app") term="iTerm2" ;;
|
"iTerm.app") term="iTerm2" ;;
|
||||||
"Terminal.app") term="Apple Terminal" ;;
|
"Terminal.app") term="Apple Terminal" ;;
|
||||||
|
"Hyper") term="HyperTerm" ;;
|
||||||
*) term="${TERM_PROGRAM/\.app}" ;;
|
*) term="${TERM_PROGRAM/\.app}" ;;
|
||||||
esac
|
esac
|
||||||
return
|
return
|
||||||
|
@ -1534,6 +1535,10 @@ gettermfont() {
|
||||||
termfont="${termfont/.pcf}"
|
termfont="${termfont/.pcf}"
|
||||||
termfont="${termfont/:*}"
|
termfont="${termfont/:*}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
"Hyper"*)
|
||||||
|
termfont="$(awk -F "," '/fontFamily/ {a=$1} END{print a}' "${HOME}/.hyper.js" | awk -F "'" '{a=$2} END{print a}')"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
[ "$version" -ge 4 ] && termfont="${termfont^}"
|
[ "$version" -ge 4 ] && termfont="${termfont^}"
|
||||||
|
@ -2302,15 +2307,15 @@ info() {
|
||||||
eval output="\$${2}"
|
eval output="\$${2}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Trim whitespace
|
||||||
|
output="$(trim "$output")"
|
||||||
|
|
||||||
# If the output is empty, don't print anything
|
# If the output is empty, don't print anything
|
||||||
if [ -z "$output" ]; then
|
if [ -z "$output" ]; then
|
||||||
err "Info: Couldn't detect $subtitle"
|
err "Info: Couldn't detect $subtitle"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Trim whitespace
|
|
||||||
output="$(trim "$output")"
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
title)
|
title)
|
||||||
string="${title_color}${bold}${output}"
|
string="${title_color}${bold}${output}"
|
||||||
|
@ -2631,7 +2636,7 @@ bold() {
|
||||||
# Linebreak {{{
|
# Linebreak {{{
|
||||||
|
|
||||||
getlinebreak() {
|
getlinebreak() {
|
||||||
linebreak=" "
|
linebreak=" "
|
||||||
|
|
||||||
# Calculate info height
|
# Calculate info height
|
||||||
info_height="$((info_height+=1))"
|
info_height="$((info_height+=1))"
|
||||||
|
@ -3189,7 +3194,7 @@ getargs() {
|
||||||
-v) verbose="on" ;;
|
-v) verbose="on" ;;
|
||||||
-vv) set -x; verbose="on" ;;
|
-vv) set -x; verbose="on" ;;
|
||||||
--help) usage ;;
|
--help) usage ;;
|
||||||
--version) printf "%s\n" "Neofetch 2.0"; exit ;;
|
--version) printf "%s\n" "Neofetch 1.9.1"; exit ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
shift
|
shift
|
||||||
|
|
|
@ -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
|
.SH NAME
|
||||||
neofetch \- simple system information script
|
neofetch \- simple system information script
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue