kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge master

Browse source
This commit is contained in:
Dylan Araps 2016-10-21 18:42:25 +11:00
commit 5f4e9e5d8e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
neofetch
View file

@ -756,7 +756,7 @@ getcpu() {
"Mac OS X") "Mac OS X")
cpu="$(sysctl -n machdep.cpu.brand_string)" cpu="$(sysctl -n machdep.cpu.brand_string)"
cores="$(sysctl -n hw.physicalcpu)" cores="$(sysctl -n hw.ncpu)"
;; ;;
"iPhone OS") "iPhone OS")
@ -1598,7 +1598,7 @@ getterm() {
case "${name// }" in case "${name// }" in
"${SHELL/*\/}" | *"sh" | "tmux"* | "screen") getterm "$parent" ;; "${SHELL/*\/}" | *"sh" | "tmux"* | "screen") getterm "$parent" ;;
"login" | "init") term="$(tty)" ;; "login"* | *"Login"* | "init") term="$(tty)" ;;
"ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) unset term ;; "ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) unset term ;;
"gnome-terminal-") term="gnome-terminal" ;; "gnome-terminal-") term="gnome-terminal" ;;
*) term="${name##*/}" ;; *) term="${name##*/}" ;;
@ -1972,7 +1972,7 @@ getcols() {
# Add newlines to the string. # Add newlines to the string.
cols="${cols%%'nl'}" cols="${cols%%'nl'}"
cols="${cols//nl/\\n${padding}​}" cols="${cols//nl/\\n${padding}${zws}}"
fi fi
} }
@ -2171,6 +2171,7 @@ getimage() {
return return
else else
clear clear
zws="​ "
fi fi
# Get terminal lines and columns # Get terminal lines and columns
@ -2445,7 +2446,7 @@ info() {
[ -z "$2" ] && string="${string/*: }" [ -z "$2" ] && string="${string/*: }"
# Print the string # Print the string
printf "%b%s\n" "${padding}​${string}${reset} " printf "%b%s\n" "${padding}${zws}${string}${reset} "
# Calculate info height # Calculate info height
info_height="$((info_height+=1))" info_height="$((info_height+=1))"
@ -2480,7 +2481,7 @@ prin() {
string="$(trim "$string")" string="$(trim "$string")"
# Print the info # Print the info
printf "%b%s\n" "${padding}​${string}${reset} " printf "%b%s\n" "${padding}${zws}${string}${reset} "
# Calculate info height # Calculate info height
info_height="$((info_height+=1))" info_height="$((info_height+=1))"