|
8 | 8 | CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
9 | 9 | source "$CURRENT_DIR/helpers.sh" |
10 | 10 |
|
11 | | -mem_view_tmpl=$(get_tmux_option "@sysstat_mem_view_tmpl" '#[fg=#{mem.color}]#{mem.pused}#[default]') |
| 11 | +mem_view_tmpl=$(get_tmux_option "@sysstat_mem_view_tmpl" '#[fg=#{mem.color2}]#{mem.pused}#[default]') |
12 | 12 |
|
13 | 13 | mem_stress_threshold=$(get_tmux_option "@sysstat_mem_stress_threshold" "80") |
14 | 14 | swap_stress_threshold=$(get_tmux_option "@sysstat_swap_stress_threshold" "80") |
@@ -71,15 +71,19 @@ print_mem() { |
71 | 71 | mem_view="${mem_view//'#{mem.pused}'/$(printf "%.0f%%" "$mem_pused")}" |
72 | 72 | mem_view="${mem_view//'#{mem.free}'/$(printf "%.0fM" "$mem_free")}" |
73 | 73 | mem_view="${mem_view//'#{mem.pfree}'/$(printf "%.0f%%" "$mem_pfree")}" |
74 | | - mem_view="${mem_view//'#{mem.total}'/$(printf "%.0fM" "$mem_total")}" |
75 | | - mem_view="${mem_view//'#{mem.color}'/$mem_color}" |
| 74 | + mem_view="${mem_view//'#{mem.total}'/$(printf "%.0fM" "$mem_total")}" |
| 75 | + mem_view="${mem_view//'#{mem.color}'/$(echo "$mem_color" | awk '{ print $1 }')}" |
| 76 | + mem_view="${mem_view//'#{mem.color2}'/$(echo "$mem_color" | awk '{ print $2 }')}" |
| 77 | + mem_view="${mem_view//'#{mem.color3}'/$(echo "$mem_color" | awk '{ print $3 }')}" |
76 | 78 |
|
77 | 79 | mem_view="${mem_view//'#{swap.used}'/$(printf "%.0fM" "$swap_used")}" |
78 | 80 | mem_view="${mem_view//'#{swap.pused}'/$(printf "%.0f%%" "$swap_pused")}" |
79 | 81 | mem_view="${mem_view//'#{swap.free}'/$(printf "%.0fM" "$swap_free")}" |
80 | 82 | mem_view="${mem_view//'#{swap.pfree}'/$(printf "%.0f%%" "$swap_pfree")}" |
81 | 83 | mem_view="${mem_view//'#{swap.total}'/$(printf "%.0fM" "$swap_total")}" |
82 | | - mem_view="${mem_view//'#{swap.color}'/$swap_color}" |
| 84 | + mem_view="${mem_view//'#{swap.color}'/$(echo "$swap_color" | awk '{ print $1 }')}" |
| 85 | + mem_view="${mem_view//'#{swap.color2}'/$(echo "$swap_color" | awk '{ print $2 }')}" |
| 86 | + mem_view="${mem_view//'#{swap.color3}'/$(echo "$swap_color" | awk '{ print $3 }')}" |
83 | 87 |
|
84 | 88 | echo "$mem_view" |
85 | 89 | } |
@@ -117,8 +121,6 @@ get_mem_usage_osx(){ |
117 | 121 | } |
118 | 122 |
|
119 | 123 | main() { |
120 | | - # echo "$(date)" >> ~/.tmux/sysstat_mem.log |
121 | | - |
122 | 124 | print_mem |
123 | 125 | } |
124 | 126 |
|
|
0 commit comments