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

Merge branch 'master' of github.com:dylanaraps/neofetch

Browse source
This commit is contained in:
Dylan Araps 2017-06-04 11:07:41 +10:00
commit fa26836b53
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -46,6 +46,7 @@
- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)** - Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)**
- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)** - [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)**
- Use `$SSH_TTY` for terminal detection if machine is connected via SSH.
**GPU** **GPU**

26
neofetch
View file

@ -243,12 +243,13 @@ get_model() {
;; ;;
"Mac OS X") "Mac OS X")
if [[ "$(kextstat | grep "FakeSMC")" ]]; then if [[ "$(kextstat | grep "FakeSMC")" != "" ]]; then
model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" model="Hackintosh (SMBIOS: $(sysctl -n hw.model))"
else else
model="$(sysctl -n hw.model)" model="$(sysctl -n hw.model)"
fi fi
;; ;;
"iPhone OS") "iPhone OS")
case "$machine_arch" in case "$machine_arch" in
"iPad1,1") model="iPad" ;; "iPad1,1") model="iPad" ;;
@ -1647,15 +1648,20 @@ get_term() {
# Check $PPID for terminal emulator. # Check $PPID for terminal emulator.
while [[ -z "$term" ]]; do while [[ -z "$term" ]]; do
parent="$(get_ppid "$parent")" if [[ "$SSH_CONNECTION" ]]; then
name="$(get_process_name "$parent")" term="$SSH_TTY"
case "${name// }" in else
"${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;; parent="$(get_ppid "$parent")"
"login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;; [[ -z "$parent" ]] && break
"ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) break ;; name="$(get_process_name "$parent")"
"gnome-terminal-") term="gnome-terminal" ;; case "${name// }" in
*) term="${name##*/}" ;; "${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;;
esac "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;;
"ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) break ;;
"gnome-terminal-") term="gnome-terminal" ;;
*) term="${name##*/}" ;;
esac
fi
done done
# Log that the function was run. # Log that the function was run.