mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 22:34:23 -07:00
statusrc:
- define and use a color function for all status indicators, gives infinite flexibility - replace "undo" with "-"
This commit is contained in:
parent
f9ea04be34
commit
cd02a609c1
27 changed files with 33 additions and 31 deletions
|
@ -36,4 +36,4 @@ if [ "$1" = "--detail" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Print {!} if a /var/crash/*.crash file exists
|
# Print {!} if a /var/crash/*.crash file exists
|
||||||
ls /var/crash/*.crash >/dev/null 2>&1 && printf "$(color y k){!}$(color undo) "
|
ls /var/crash/*.crash >/dev/null 2>&1 && printf "$(color y k){!}$(color -) "
|
||||||
|
|
|
@ -77,6 +77,6 @@ for bat in $(ls /proc/acpi/battery); do
|
||||||
sign="$state"
|
sign="$state"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
printf "$bcolor%s$(color undo)$color|%s|$(color undo) " "$percent" "$sign"
|
printf "$bcolor%s$(color -)$color|%s|$(color -) " "$percent" "$sign"
|
||||||
break
|
break
|
||||||
done
|
done
|
||||||
|
|
|
@ -30,4 +30,4 @@ if [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then
|
||||||
else
|
else
|
||||||
freq=$(egrep -i -m 1 "^cpu MHz|^clock|^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }')
|
freq=$(egrep -i -m 1 "^cpu MHz|^clock|^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }')
|
||||||
fi
|
fi
|
||||||
printf "$(color b c W)%s$(color undo)$(color c W)%s$(color undo) " "$freq" "GHz"
|
printf "$(color b c W)%s$(color -)$(color c W)%s$(color -) " "$freq" "GHz"
|
||||||
|
|
|
@ -43,6 +43,6 @@ for i in $(ls "$HOME/.$PKG/bin/"[0-9]*_* 2>/dev/null); do
|
||||||
printf "$output"
|
printf "$output"
|
||||||
else
|
else
|
||||||
# Default to inverted coloring
|
# Default to inverted coloring
|
||||||
printf "$(color invert)$output$(color undo) "
|
printf "$(color invert)$output$(color -) "
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
2
bin/disk
2
bin/disk
|
@ -34,4 +34,4 @@ esac
|
||||||
|
|
||||||
disk=$(df -h -P "$MP" 2>/dev/null || df -h "$MP")
|
disk=$(df -h -P "$MP" 2>/dev/null || df -h "$MP")
|
||||||
disk=$(echo "$disk" | tail -n 1 | awk '{print $2 " " $5}' | sed "s/\([^0-9\. ]\)/ \1/g" | awk '{printf "%d%sB,%d%", $1, $2, $3}')
|
disk=$(echo "$disk" | tail -n 1 | awk '{print $2 " " $5}' | sed "s/\([^0-9\. ]\)/ \1/g" | awk '{printf "%d%sB,%d%", $1, $2, $3}')
|
||||||
printf "$(color M W)%s$(color undo) " "$disk"
|
printf "$(color M W)%s$(color -) " "$disk"
|
||||||
|
|
|
@ -83,4 +83,4 @@ if [ "$DETAIL" = "1" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "$(color K G)~\$$(color undo)$(color b K G)%s$(color undo) " $total_cost
|
printf "$(color K G)~\$$(color -)$(color b K G)%s$(color -) " $total_cost
|
||||||
|
|
|
@ -33,7 +33,7 @@ fi
|
||||||
for i in $(find $DIR/*/*/ -type f -name "fan1_input"); do
|
for i in $(find $DIR/*/*/ -type f -name "fan1_input"); do
|
||||||
speed=$(cat "$i")
|
speed=$(cat "$i")
|
||||||
if [ "$speed" -gt 0 ]; then
|
if [ "$speed" -gt 0 ]; then
|
||||||
printf "$(color bold1)%s$(color undo)$(color none)%s$(color undo) " "$speed" "rpm"
|
printf "$(color bold1)%s$(color -)$(color none)%s$(color -) " "$speed" "rpm"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
|
@ -28,4 +28,4 @@ fi
|
||||||
. "$HOME/.$PKG/status"
|
. "$HOME/.$PKG/status"
|
||||||
[ "$whoami" = "1" ] && at="@"
|
[ "$whoami" = "1" ] && at="@"
|
||||||
|
|
||||||
printf "$(color bold2)%s%s$(color undo)" "$at" $(hostname -s 2>/dev/null || hostname)
|
printf "$(color bold2)%s%s$(color -)" "$at" $(hostname -s 2>/dev/null || hostname)
|
||||||
|
|
|
@ -38,4 +38,4 @@ fi
|
||||||
|
|
||||||
ipaddr=`/sbin/ifconfig "$interface" | grep "inet addr:" | sed -e "s/^.*inet addr://" -e "s/ .*$//"`
|
ipaddr=`/sbin/ifconfig "$interface" | grep "inet addr:" | sed -e "s/^.*inet addr://" -e "s/ .*$//"`
|
||||||
|
|
||||||
printf "%s$(color bold2)%s$(color undo)" "$space" "$ipaddr"
|
printf "%s$(color bold2)%s$(color -)" "$space" "$ipaddr"
|
||||||
|
|
|
@ -25,4 +25,4 @@ if [ "$1" = "--detail" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "$(color Y k)%s$(color undo) " $(awk '{print $1}' /proc/loadavg)
|
printf "$(color Y k)%s$(color -) " $(awk '{print $1}' /proc/loadavg)
|
||||||
|
|
2
bin/mail
2
bin/mail
|
@ -26,4 +26,4 @@ if [ "$1" = "--detail" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -s "$mailfile" ] && printf "$(color w k)[M]$(color undo) " || exit 0
|
[ -s "$mailfile" ] && printf "$(color w k)[M]$(color -) " || exit 0
|
||||||
|
|
|
@ -39,4 +39,4 @@ else
|
||||||
mem="$mem"
|
mem="$mem"
|
||||||
unit="KB"
|
unit="KB"
|
||||||
fi
|
fi
|
||||||
printf "$(color b g W)%s$(color undo)$(color g W)$unit%s$(color undo)%s" "$mem" "$comma" "$whitespace"
|
printf "$(color b g W)%s$(color -)$(color g W)$unit%s$(color -)%s" "$mem" "$comma" "$whitespace"
|
||||||
|
|
|
@ -26,4 +26,4 @@ if [ "$1" = "--detail" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
f=$(free | awk '/buffers\/cache:/ {printf "%.0f", 100*$3/($3 + $4)}')
|
f=$(free | awk '/buffers\/cache:/ {printf "%.0f", 100*$3/($3 + $4)}')
|
||||||
printf "$(color b g W)%s$(color undo)$(color g W)%%$(color undo) " "$f"
|
printf "$(color b g W)%s$(color -)$(color g W)%%$(color -) " "$f"
|
||||||
|
|
2
bin/menu
2
bin/menu
|
@ -32,4 +32,4 @@ else
|
||||||
key="F9"
|
key="F9"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf " $(color k w)%s:<$(color undo)$(color b k w)$key$(color k w)>" `gettext "Menu"`
|
printf " $(color k w)%s:<$(color -)$(color b k w)$key$(color k w)>" `gettext "Menu"`
|
||||||
|
|
|
@ -58,5 +58,5 @@ for i in up down; do
|
||||||
unit="MB/s"
|
unit="MB/s"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
printf "$symbol$(color b m w)$rate$(color undo)$(color m w)$unit$(color undo) "
|
printf "$symbol$(color b m w)$rate$(color -)$(color m w)$unit$(color -) "
|
||||||
done
|
done
|
||||||
|
|
|
@ -25,4 +25,4 @@ if [ "$1" = "--detail" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "$(color b y w)%s$(color undo)$(color y w)&$(color undo) " $(ls -d /proc/[0-9]* 2>/dev/null| wc -l)
|
printf "$(color b y w)%s$(color -)$(color y w)&$(color -) " $(ls -d /proc/[0-9]* 2>/dev/null| wc -l)
|
||||||
|
|
|
@ -31,7 +31,7 @@ case "$1" in
|
||||||
[ -e "$reboot" ] && printf "Yes" || printf "No"
|
[ -e "$reboot" ] && printf "Yes" || printf "No"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
[ -e "$reboot" ] && printf "$(color b W)($(color undo)$(color b b W)%s$(color undo)$(color b W))$(color undo) " "R"
|
[ -e "$reboot" ] && printf "$(color b W)($(color -)$(color b b W)%s$(color -)$(color b W))$(color -) " "R"
|
||||||
[ -e "$reload" ] && printf "$(color b W)<$(color undo)$(color b b W)%s$(color undo)$(color b W)>$(color undo) " "F5"
|
[ -e "$reload" ] && printf "$(color b W)<$(color -)$(color b b W)%s$(color -)$(color b W)>$(color -) " "F5"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -55,4 +55,4 @@ else
|
||||||
DISTRO="Byobu"
|
DISTRO="Byobu"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "$(color bold2)%s$(color undo) " "$DISTRO"
|
printf "$(color bold2)%s$(color -) " "$DISTRO"
|
||||||
|
|
|
@ -32,6 +32,6 @@ fi
|
||||||
|
|
||||||
for i in $MONITORED_TEMP `ls $DIR/*/temperature 2>/dev/null`; do
|
for i in $MONITORED_TEMP `ls $DIR/*/temperature 2>/dev/null`; do
|
||||||
t=$(sed -e "s/^[^0-9]\+//" -e "s/\s.*$//" "$i")
|
t=$(sed -e "s/^[^0-9]\+//" -e "s/\s.*$//" "$i")
|
||||||
printf "$(color b k Y)%s$(color undo)$(color k Y)\260C$(color undo) " "$t"
|
printf "$(color b k Y)%s$(color -)$(color k Y)\260C$(color -) " "$t"
|
||||||
break
|
break
|
||||||
done
|
done
|
||||||
|
|
|
@ -28,6 +28,6 @@ fi
|
||||||
|
|
||||||
for i in `ls $DIR/*/temperature 2>/dev/null`; do
|
for i in `ls $DIR/*/temperature 2>/dev/null`; do
|
||||||
t=$(sed -e "s/^[^0-9]\+//" -e "s/\s.*$//" "$i" | awk '{printf "%.0f", $1 *9/5 + 32}')
|
t=$(sed -e "s/^[^0-9]\+//" -e "s/\s.*$//" "$i" | awk '{printf "%.0f", $1 *9/5 + 32}')
|
||||||
printf "$(color b k Y)%s$(color undo)$(color k Y)\260F$(color undo) " "$t"
|
printf "$(color b k Y)%s$(color -)$(color k Y)\260F$(color -) " "$t"
|
||||||
break
|
break
|
||||||
done
|
done
|
||||||
|
|
|
@ -38,13 +38,13 @@ print_updates() {
|
||||||
s=$2
|
s=$2
|
||||||
if [ -n "$u" ]; then
|
if [ -n "$u" ]; then
|
||||||
if [ "$u" -gt 0 ]; then
|
if [ "$u" -gt 0 ]; then
|
||||||
printf "$(color b r W)%d$(color undo)$(color r W)!" "$u"
|
printf "$(color b r W)%d$(color -)$(color r W)!" "$u"
|
||||||
if [ -n "$s" ]; then
|
if [ -n "$s" ]; then
|
||||||
if [ "$s" -gt 0 ]; then
|
if [ "$s" -gt 0 ]; then
|
||||||
printf "!"
|
printf "!"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
printf "$(color undo) "
|
printf "$(color -) "
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,4 +39,4 @@ elif [ "$u" -gt 60 ]; then
|
||||||
else
|
else
|
||||||
printf "%ds" "$u"
|
printf "%ds" "$u"
|
||||||
fi
|
fi
|
||||||
printf "$(color undo) "
|
printf "$(color -) "
|
||||||
|
|
|
@ -31,4 +31,4 @@ fi
|
||||||
# Note: we'd like to use pgrep -c, however, this isn't available in
|
# Note: we'd like to use pgrep -c, however, this isn't available in
|
||||||
# busybox and some distro's pgrep (and it doesn't exit non-zero).
|
# busybox and some distro's pgrep (and it doesn't exit non-zero).
|
||||||
count=`pgrep -f "sshd:.*@" | wc -l` || exit 0
|
count=`pgrep -f "sshd:.*@" | wc -l` || exit 0
|
||||||
[ $count -gt 0 ] && printf "$(color b w r)%d$(color undo)$(color w r)#$(color undo) " $count
|
[ $count -gt 0 ] && printf "$(color b w r)%d$(color -)$(color w r)#$(color -) " $count
|
||||||
|
|
|
@ -24,4 +24,4 @@ if [ "$1" = "--detail" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "$(color bold2)%s$(color undo)" $(whoami)
|
printf "$(color bold2)%s$(color -)" $(whoami)
|
||||||
|
|
|
@ -29,4 +29,4 @@ iwconfig=`/sbin/iwconfig 2>/dev/null`
|
||||||
bitrate=`echo "$iwconfig" | grep "Bit Rate." | sed -e "s/^.*Bit Rate.//" -e "s/ .*$//g"`
|
bitrate=`echo "$iwconfig" | grep "Bit Rate." | sed -e "s/^.*Bit Rate.//" -e "s/ .*$//g"`
|
||||||
[ -z "$bitrate" ] && bitrate="0"
|
[ -z "$bitrate" ] && bitrate="0"
|
||||||
quality=`echo "$iwconfig" | grep "Link Quality." | sed -e "s/^.*Link Quality.//" -e "s/ .*$//g" | awk -F/ '{printf "%.0f", 100*$1/$2}'`
|
quality=`echo "$iwconfig" | grep "Link Quality." | sed -e "s/^.*Link Quality.//" -e "s/ .*$//g" | awk -F/ '{printf "%.0f", 100*$1/$2}'`
|
||||||
printf "$(color b C k)%s$(color undo)$(color C k)%s,$(color undo)$(color b C k)%s$(color undo)$(color C k)%%$(color UNDO) " "$bitrate" "Mbps" "$quality"
|
printf "$(color b C k)%s$(color -)$(color C k)%s,$(color -)$(color b C k)%s$(color -)$(color C k)%%$(color UNDO) " "$bitrate" "Mbps" "$quality"
|
||||||
|
|
|
@ -35,15 +35,15 @@ ESC="\005"
|
||||||
color() {
|
color() {
|
||||||
case $1 in
|
case $1 in
|
||||||
"") true ;;
|
"") true ;;
|
||||||
|
-) printf "$ESC{-}" ;;
|
||||||
esc) printf "$ESC" ;;
|
esc) printf "$ESC" ;;
|
||||||
undo) printf "$ESC{-}" ;;
|
|
||||||
bold1) printf "$ESC{=b }" ;;
|
bold1) printf "$ESC{=b }" ;;
|
||||||
bold2) printf "$ESC{+b }" ;;
|
bold2) printf "$ESC{+b }" ;;
|
||||||
none) printf "$ESC{= }" ;;
|
none) printf "$ESC{= }" ;;
|
||||||
invert) printf "$ESC{=r }" ;;
|
invert) printf "$ESC{=r }" ;;
|
||||||
*)
|
*)
|
||||||
if [ "$#" = "2" ]; then
|
if [ "$#" = "2" ]; then
|
||||||
[ "$MONOCHROME" = "1" ] && printf "$ESC{ }" || printf "$ESC{= $1$2}"
|
[ "$MONOCHROME" = "1" ] && printf "$ESC{= }" || printf "$ESC{= $1$2}"
|
||||||
else
|
else
|
||||||
[ "$MONOCHROME" = "1" ] && printf "$ESC{=$1 }" || printf "$ESC{=$1 $2$3}"
|
[ "$MONOCHROME" = "1" ] && printf "$ESC{=$1 }" || printf "$ESC{=$1 $2$3}"
|
||||||
fi
|
fi
|
||||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -69,8 +69,10 @@ byobu (2.40) unreleased; urgency=low
|
||||||
bin/menu, bin/network, bin/processes, bin/reboot_required,
|
bin/menu, bin/network, bin/processes, bin/reboot_required,
|
||||||
bin/release, bin/temp_c, bin/temp_f, bin/updates_available,
|
bin/release, bin/temp_c, bin/temp_f, bin/updates_available,
|
||||||
bin/uptime, bin/users, bin/whoami, bin/wifi_quality, byobu-status,
|
bin/uptime, bin/users, bin/whoami, bin/wifi_quality, byobu-status,
|
||||||
statusrc: define and use a color function for all status indicators,
|
statusrc:
|
||||||
gives infinite flexibility
|
- define and use a color function for all status indicators, gives
|
||||||
|
infinite flexibility
|
||||||
|
- replace "undo" with "-"
|
||||||
|
|
||||||
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 10 Nov 2009 10:18:20 -0600
|
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 10 Nov 2009 10:18:20 -0600
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue