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