stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Darwin is NOT FreeBSD

Browse Source 
The Colors declarations for Darwin should use the Linux method and NOT
the FreeBSD method or you get errors:
tput: unknown terminfo capability 'AF'
This commit is contained in:
Ludovic Rousseau 2012-08-21 23:35:14 +02:00
parent 1ca2808ffd
commit 8192ed9a84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
liquidprompt
View File

@ -72,7 +72,7 @@ fi
case $(uname) in case $(uname) in
FreeBSD) LP_OS=FreeBSD ;; FreeBSD) LP_OS=FreeBSD ;;
DragonFly) LP_OS=FreeBSD ;; DragonFly) LP_OS=FreeBSD ;;
Darwin) LP_OS=FreeBSD ;; Darwin) LP_OS=Darwin ;;
SunOS) LP_OS=SunOS ;; SunOS) LP_OS=SunOS ;;
*) LP_OS=Linux ;; *) LP_OS=Linux ;;
esac esac
@ -147,7 +147,7 @@ fi
# Get cpu count # Get cpu count
case "$LP_OS" in case "$LP_OS" in
Linux) _lp_CPUNUM=$( nproc 2>/dev/null || grep -c '^[Pp]rocessor' /proc/cpuinfo ) ;; Linux) _lp_CPUNUM=$( nproc 2>/dev/null || grep -c '^[Pp]rocessor' /proc/cpuinfo ) ;;
FreeBSD) _lp_CPUNUM=$( sysctl -n hw.ncpu ) ;; FreeBSD|Darwin) _lp_CPUNUM=$( sysctl -n hw.ncpu ) ;;
SunOS) _lp_CPUNUM=$( kstat -m cpu_info | grep -c "module: cpu_info" ) ;; SunOS) _lp_CPUNUM=$( kstat -m cpu_info | grep -c "module: cpu_info" ) ;;
esac esac
@ -161,7 +161,7 @@ case "$LP_OS" in
echo "$load" echo "$load"
} }
;; ;;
FreeBSD) FreeBSD|Darwin)
_lp_cpu_load () { _lp_cpu_load () {
local bol load eol local bol load eol
read bol load eol < $<( LANG=C sysctl -n vm.loadavg ) read bol load eol < $<( LANG=C sysctl -n vm.loadavg )