Merge pull request #260 from maddcoder/master

Add Fish version and fix BC scale.
This commit is contained in:
Dylan Araps 2016-05-21 17:02:00 +10:00
commit e1da812ee8
1 changed files with 5 additions and 1 deletions

View File

@ -770,6 +770,10 @@ getshell () {
shell=${shell/tcsh} shell=${shell/tcsh}
shell=${shell/\(*} shell=${shell/\(*}
;; ;;
*"fish"*)
shell+="$("$SHELL" -c 'printf "%s" "$FISH_VERSION"')"
;;
esac esac
shell="${shell/\(*\)}" shell="${shell/\(*\)}"
@ -1404,7 +1408,7 @@ getmemory () {
;; ;;
"Mac OS X" | "iPhone OS") "Mac OS X" | "iPhone OS")
memtotal=$(printf "%s\n" "$(sysctl -n hw.memsize)"/1024^2 | bc) memtotal=$(printf "scale=0; %s\n" "$(sysctl -n hw.memsize)"/1024^2 | bc)
memwired=$(vm_stat | awk '/wired/ { print $4 }') memwired=$(vm_stat | awk '/wired/ { print $4 }')
memactive=$(vm_stat | awk '/active / { printf $3 }') memactive=$(vm_stat | awk '/active / { printf $3 }')
memcompressed=$(vm_stat | awk '/occupied/ { printf $5 }') memcompressed=$(vm_stat | awk '/occupied/ { printf $5 }')