From ca71f3529bb2447fcf1d1abde00c8beff3149279 Mon Sep 17 00:00:00 2001 From: James Hunt Date: Thu, 3 Feb 2011 23:06:07 +0000 Subject: [PATCH] [ James Hunt ] * usr/lib/byobu/uclock: New UTF-8 notification showing time in binary (requires bash) (LP: #705037). * usr/lib/byobu/ugraph: New UTF-8 notification utility showing historical ulevel data (required bash). * usr/lib/byobu/ulevel: New UTF-8 notification utility which displays some 'level' using various unicode characters (requires bash) (LP: #705032). * usr/lib/byobu/wastebasket: New ASCII+UTF-8 notification indicating contents of wastebasket. * usr/lib/byobu/wifi_quality: added UTF-8 icon. --- debian/changelog | 13 + usr/lib/byobu/Makefile.am | 2 +- usr/lib/byobu/uclock | 173 +++++++++++++ usr/lib/byobu/ugraph | 212 ++++++++++++++++ usr/lib/byobu/ulevel | 481 +++++++++++++++++++++++++++++++++++++ usr/lib/byobu/wastebasket | 39 +++ usr/lib/byobu/wifi_quality | 3 +- 7 files changed, 921 insertions(+), 2 deletions(-) create mode 100755 usr/lib/byobu/uclock create mode 100755 usr/lib/byobu/ugraph create mode 100755 usr/lib/byobu/ulevel create mode 100755 usr/lib/byobu/wastebasket diff --git a/debian/changelog b/debian/changelog index 30d4bd55..193e5fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,22 @@ byobu (3.28) unreleased; urgency=low + [ Dustin Kirkland ] * usr/lib/byobu/wifi_quality: don't show wifi-quality if connectivity == 0 * usr/lib/byobu/disk_io: don't show disk_io if rate = 0 * usr/lib/byobu/services: finally fix that nagging, mysterious whitespace + [ James Hunt ] + * usr/lib/byobu/uclock: New UTF-8 notification showing time in binary + (requires bash) (LP: #705037). + * usr/lib/byobu/ugraph: New UTF-8 notification utility showing historical + ulevel data (required bash). + * usr/lib/byobu/ulevel: New UTF-8 notification utility which displays + some 'level' using various unicode characters (requires bash) + (LP: #705032). + * usr/lib/byobu/wastebasket: New ASCII+UTF-8 notification indicating + contents of wastebasket. + * usr/lib/byobu/wifi_quality: added UTF-8 icon. + -- Dustin Kirkland Fri, 28 Jan 2011 17:12:27 -0600 byobu (3.27-0ubuntu1) natty; urgency=low diff --git a/usr/lib/byobu/Makefile.am b/usr/lib/byobu/Makefile.am index 435536db..866b31e2 100644 --- a/usr/lib/byobu/Makefile.am +++ b/usr/lib/byobu/Makefile.am @@ -1,3 +1,3 @@ libdirdir = $(prefix)/lib/@PACKAGE@ -libdir_SCRIPTS = apport arch battery cpu_count cpu_freq cpu_temp custom date disk disk_io ec2_cost fan_speed hostname ip_address load_average logo mail mem_available mem_used menu network .notify_osd notify_osd processes raid rcs_cost reboot_required release services swap time time_utc updates_available uptime users whoami wifi_quality +libdir_SCRIPTS = apport arch battery cpu_count cpu_freq cpu_temp custom date disk disk_io ec2_cost fan_speed hostname ip_address load_average logo mail mem_available mem_used menu network .notify_osd notify_osd processes raid rcs_cost reboot_required release services swap time time_utc uclock ugraph ulevel updates_available uptime users wastebasket whoami wifi_quality diff --git a/usr/lib/byobu/uclock b/usr/lib/byobu/uclock new file mode 100755 index 00000000..a594e1c0 --- /dev/null +++ b/usr/lib/byobu/uclock @@ -0,0 +1,173 @@ +#!/bin/bash -e +#--------------------------------------------------------------------- +# Script to display a "binary clock" using unicode characters from the +# braille block. +# +# Designed to work with the wonderful byoby(1) but can be run +# stand-alone. +#--------------------------------------------------------------------- +# +# Copyright (C) 2011 Canonical Ltd. +# +# Author: James Hunt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +#--------------------------------------------------------------------- + +script_name=${0##*/} + +# Selected Unicode Braille characters: +# +# 0x2800, 0x2880, 0x2820, 0x28a0, 0x2810, 0x2890, 0x2830, 0x28b0, 0x2808, 0x2888, +# 0x2840, 0x28c0, 0x2860, 0x28e0, 0x2850, 0x28d0, 0x2870, 0x28f0, 0x2848, 0x28c8, +# 0x2804, 0x2884, 0x2824, 0x28a4, 0x2814, 0x2894, 0x2834, 0x28b4, 0x280c, 0x288c, +# 0x2844, 0x28c4, 0x2864, 0x28e4, 0x2854, 0x28d4, 0x287b, 0x28f4, 0x284c, 0x28cc, +# 0x2802, 0x2882, 0x2822, 0x28a2, 0x2812, 0x2892, 0x2832, 0x28b2, 0x280a, 0x288a, +# 0x2842, 0x28c2, 0x2862, 0x28e2, 0x2852, 0x28d2, 0x2872, 0x28f2, 0x284a, 0x28ca, +# 0x2806, 0x2886 +# +# Index of this array is 0-61 with character returned being +# "two column" binary representation of a time segment. +# +binary=(⠀ ⢀ ⠠ ⢠ ⠐ ⢐ ⠰ ⢰ ⠈ ⢈ \ + ⡀ ⣀ ⡠ ⣠ ⡐ ⣐ ⡰ ⣰ ⡈ ⣈ \ + ⠄ ⢄ ⠤ ⢤ ⠔ ⢔ ⠴ ⢴ ⠌ ⢌ \ + ⡄ ⣄ ⡤ ⣤ ⡔ ⣔ ⡻ ⣴ ⡌ ⣌ \ + ⠂ ⢂ ⠢ ⢢ ⠒ ⢒ ⠲ ⢲ ⠊ ⢊ \ + ⡂ ⣂ ⡢ ⣢ ⡒ ⣒ ⡲ ⣲ ⡊ ⣊ ⠆ ⢆) + +usage() +{ +cat < : Specify separator between hours and minutes + (and seconds if not disabled). + -u : Display alphabetics in upper-case (hex mode only). + -x : Disable time in hexadecimal (base 16). + -z : Disable display of seconds. + +EOT +} + +suppress_seconds=n +clock_type=binary +format=std +ending="\n" +uppercase=n +leading_zeros=n + +while getopts "bhlmnos:uxz" opt +do + case "$opt" in + b) + clock_type=binary + ;; + + h) + usage + exit 0 + ;; + + l) + leading_zeros=y + ;; + + m) + format=mil + ;; + + n) + ending= + ;; + + o) + clock_type=oct + ;; + + s) + sep=$OPTARG + ;; + + u) + uppercase=y + ;; + + x) + clock_type=hex + ;; + + z) + suppress_seconds=y + ;; + esac +done + +if [ -z "$clock_type" ] +then + echo "ERROR: must specify clock type" + exit 1 +fi + +shift $[$OPTIND-1] + +# get current time, handling 12-hour or 24-hour +if [ $format = std ] +then + hrs_format=%l +else + hrs_format=%k +fi + +time=($(date "+${hrs_format} %M %S")) +h=$(printf ${time[0]}) +m=$(printf ${time[1]}) +s=$(printf ${time[2]}) + +if [ $clock_type = binary ] +then + [ $suppress_seconds = n ] && seconds="${sep}${binary[10#$s]}" + display_time="${binary[10#$h]}${sep}${binary[10#$m]}${seconds}${ending}" +else + if [ $clock_type = hex ] + then + conversion=x + [ $uppercase = y ] && conversion=X + else + conversion=o + fi + precision= + [ $leading_zeros = y ] && precision=.2 + base_format=%2${precision}${conversion} + + hh=$(printf "$base_format" $h) + hm=$(printf "$base_format" $m) + [ "$suppress_seconds" = n ] && hs="${sep}$(printf "$base_format" $s)" + display_time="${hh}${sep}${hm}${hs}${ending}" +fi + +echo -ne "$display_time" +exit 0 diff --git a/usr/lib/byobu/ugraph b/usr/lib/byobu/ugraph new file mode 100755 index 00000000..9a2d20df --- /dev/null +++ b/usr/lib/byobu/ugraph @@ -0,0 +1,212 @@ +#!/bin/bash +#--------------------------------------------------------------------- +# Script to display a byobo notification "history graph". +# +# Designed to work with the wonderful byoby(1) but can be run +# stand-alone. +#--------------------------------------------------------------------- +# +# Copyright (C) 2011 Canonical Ltd. +# +# Author: James Hunt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +#--------------------------------------------------------------------- + +script_name=${0##*/} +min_default=0 +max_default=100 +points_default=5 +theme_default=vbars_8 +newline="\n" +rotate=y + +error() +{ + msg="$*" + echo "ERROR: $msg" >&2 +} + +die() +{ + error "$*" + exit 1 +} + +usage() +{ +cat < : File to read data points from. + (only required if no command specified). + -h : Show this help. + -m : Minimum value (default=$min_default). + -n : Supress output of newline character. + -p : Specify number of data points in graph + (default=$points_default). + -r : Do not rotate file (default is to rotate). + Option implies file should not be written to + so a command cannot follow script options in this case. + -t : 'ulevel' theme to use (default=$theme_default). + -x : Maximum value (default=$max_default). + + +Examples: + + Using $script_name to run a command, rotate log and display graph. + + Here we specify a command to display available memory. + Trailing echo adds a required newline + Note no filename specified. + + $script_name "(/usr/lib/byobu/mem_used |sed 's/% //g';echo)" + + + Using $script_name just to rotate log and display the graph + + file=/tmp/load.dat + awk '{ print \$1}' /proc/loadavg >> \$file + $script_name -f \$file + +Notes: + + - If you specify 'command', care must be taken with shell quoting to + avoid expansion prior to this script running the command. + - If '-r' is not specified, the file will be rotated such that + at most lines are retained on each invocation of this + script. + +EOT +} + +get_data() +{ + needed_lines=$points + + if [ ! -f $file ] + then + return + fi + + lines=$(wc -l $file|awk '{print $1}') + + if [ $lines -lt $needed_lines ] + then + # insufficient data + return + fi + + bytes=$(<${file}) + bytes=$(echo "$bytes"|tail -n ${needed_lines}) + [ $lines -eq $needed_lines -o $rotate = n ] && echo "$bytes" && return + + # rotate + tmp=`tempfile` + echo "$bytes" > $tmp + mv $tmp $file + + echo "$bytes" +} + +while getopts "f:hm:np:rt:x:" opt +do + case "$opt" in + f) + file="$OPTARG" + ;; + + h) + usage + exit 0 + ;; + + m) + min=$OPTARG + ;; + + n) + newline= + ;; + + p) + points=$OPTARG + ;; + + r) + rotate=n + ;; + + t) + theme="$OPTARG" + ;; + + x) + max=$OPTARG + ;; + esac +done + +shift $[$OPTIND-1] + +cmd="$@" + +[ -z "$theme" ] && theme=$theme_default + +if [ -z "$cmd" ] +then + if [ -z "$file" ] + then + error "must specify file" + usage + exit 1 + fi +fi + +if [ -z "$file" ] +then + # we could go cryptic+safe by calling tempfile(1), but that then + # makes it very difficult to find in case of need. + file=/tmp/${USER}-${script_name}-$$.dat +fi + +[ -z "$min" ] && min=$min_default +[ -z "$max" ] && max=$max_default +[ -z "$points" ] && points=$points_default + +if [ ! -z "$cmd" ] +then + if [ $rotate = n ] + then + error "cannot write to file if rotate disabled" + usage + exit 1 + fi + + eval "$cmd >>$file" +fi + +data=$(get_data) + +[ -z "$data" ] && printf "%*.s${newline}" $points && exit 0 + +for datum in $data +do + ulevel.sh -n -m $min -x $max -c $datum -t $theme +done diff --git a/usr/lib/byobu/ulevel b/usr/lib/byobu/ulevel new file mode 100755 index 00000000..c6d5334c --- /dev/null +++ b/usr/lib/byobu/ulevel @@ -0,0 +1,481 @@ +#!/bin/bash +#--------------------------------------------------------------------- +# Script to display unicode characters representing the level of +# some indicator. +# +# Designed to work with the wonderful byoby(1) but can be run +# stand-alone. +#--------------------------------------------------------------------- +# +# Copyright (C) 2011 Canonical Ltd. +# +# Author: James Hunt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +#--------------------------------------------------------------------- + +#------------------------------ +# Themes with 2 values. +# +# Two-value themes are handled differently to other n-value types of +# theme: the first array entry in each theme is generally some unfilled +# glyph, denoting an "off" value and the second value is the filled +# version of the unfilled glyph and denotes an "on" value. Note that +# you can always change the ordering of these values using the 'invert' +# command-line option. + +circles_2=(○ ●) +diamonds_2=(◇ ◆) +flags_2=(⚐ ⚑) +hearts_2=(♡ ♥) +squares_2=(◻ ◼) +squares_small_2=(◽ ◾) +stars_2=(☆ ★) + +#------------------------------ +# Themes with 4 values. + +vdots_thick_4=(⣀ ⣤ ⣶ ⣿) +vdots_thin_4=(⢀ ⢠ ⢰ ⢸) +fractions_4=(¼ ½ ¾ ¹) +quadrants_4=(◔ ◑ ◕ ●) +shades_4=(░ ▒ ▓ █) + +#------------------------------ +# Themes with 5 values. + +circles_5=(◦ ○ ◎ ◉ ●) + +#------------------------------ +# Themes with 6 values. + +dice_6=(⚀ ⚁ ⚂ ⚃ ⚄ ⚅) + +#------------------------------ +# Themes with 8 values. + +hbars_8=(▏ ▎ ▍ ▌ ▋ ▊ ▉ █) +vbars_8=(▁ ▂ ▃ ▄ ▅ ▆ ▇ █) + +#------------------------------ +# Themes with 10 values. + +circle_number_10=(➀ ➁ ➂ ➃ ➄ ➅ ➆ ➇ ➈ ➉) +solid_numbers_a_10=(➊ ➋ ➌ ➍ ➎ ➏ ➐ ➑ ➒ ➓) +solid_numbers_b_10=(❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿) + +#------------------------------ +# XXX: remember to update if you add new themes above! + +theme_list=\ +( + 'circles_2 diamonds_2 flags_2 hearts_2 squares_2 squares_small_2 stars_2' + 'vdots_thick_4 vdots_thin_4 fractions_4 quadrants_4 shades_4' + 'circles_5' + 'dice_6' + 'hbars_8 vbars_8' + 'circle_number_10 solid_numbers_a_10 solid_numbers_b_10' +) + +#------------------------------ + +debug_enabled=n +newline= +list=n +quiet=n +invert=n +reverse=n +script_name=${0##*/} +min_default=0 +max_default=100 +width_default=5 +zero_as_space=n +theme_default=vbars_8 + +debug() +{ + msg="$*" + [ $debug_enabled = y ] && echo "DEBUG: $msg" +} + +error() +{ + msg="$*" + echo "ERROR: $msg" >&2 +} + +die() +{ + error "$*" + exit 1 +} + +bc_test() +{ + expr="$*" + echo $(echo "if ( $expr ) { print \"1\" }"|bc -l) +} + +assert() +{ + expr="$1" + str="$2" + + debug "assert: expr='$expr'" + ret=$(bc_test "$expr") + + [ ! -z "$ret" ] && return + + die "$str" +} + +usage() +{ +cat < + $script_name [options] + $script_name + +Options: + + -b : Display current value as space if zero, rather than lowest + 'value' of theme. + -c : Current value of your indicator. + -d : Enable debug output. + -h : Show this help. + -i : Invert colour scheme (rating themes only). + -l : List available themes. If '-t' also specified, + show all values for specified theme. + -m : Minimum value (default=$min_default). + -n : Supress output of newline character. + -q : Suppress messages (requires '-t'). + -r : Reverse 'direction' of display (rating theme only). + -t : Name of theme (default=$theme_default). + -u : Specify a user theme (2 or more values). + -w : Width of rating theme (default=$width_default). + -x : Maximum value (default=$max_default). + + +Examples: + + # Display character representing 27% using default theme. + $script_name 27 + + # As above. + $script_name -c 27 + + # Example showing floating-point and negative values. + $script_name -c 1.100001 -m -5.00234 -x 2.71828 -t dice_6 + + # Display value using a "rating theme" (displayed left-to-right). + $script_name -c 83 -t stars_2 + + # Display right-to-left inverted "rating theme". + $script_name -c 60 -t diamonds_2 -ri + + # Display all glyphs in 'solid_numbers_a_10' theme. + $script_name -l -t solid_numbers_a_10 + + # Display a user-specified rating theme 10 glyphs wide. + $script_name -c 666.321 -m -273.15 -x 1370 -u "· ☢" -w 10 + + # A multi-element user theme (this prints 'e'). + $script_name -c 50 -u "a b c d e f g h i j" + + +Notes: + + - Arguments of type "" denote an integer value, whereas arguments + of type "" denotes either an integer or a floating-point + number. + - The final '_' in a theme name denotes the number of glyphs + in it. + - "Rating themes" are those with only 2 values. + - The argument to '-u' must contain space-delimited + characters. + +EOT +} + +# this is horribly inefficient - we should probably do some clever +# tricks using printf formats to avoid the silly while loop. +# Additionally, it is rather similar to show_theme_entry() but was split +# out from that in a vain attempt to make the overall logic clearer :) +show_rating_theme() +{ + theme="$1" + min="$2" + max="$3" + current="$4" + quotient="$5" + + if [ $invert = n ] + then + on=1 + off=0 + else + on=0 + off=1 + fi + + percent=$(echo "$quotient * 100"|bc -l) + debug "width=$width" + debug "percent=$percent" + + percent_per_glyph=$(echo "scale=4;100/${width}"|bc -l) + assert "$percent_per_glyph > 1.0" "width ($width) too great" + debug "percent_per_glyph=$percent_per_glyph" + + debug "glyph_count=$glyph_count" + + g=$percent_per_glyph + i=0 + value="" + while [ $i -lt $width ] + do + if [ ! -z "$(bc_test "$g <= $percent")" ] + then + eval content="\${$theme[${on}]}" + else + eval content="\${$theme[${off}]}" + fi + if [ $reverse = n ] + then + value="${value}${content}" + else + value="${content}${value}" + fi + g=$(echo "$g + $percent_per_glyph"|bc -l) + i=$((i + 1)) + done + echo $newline "$value" +} + +show_theme_entry() +{ + theme="$1" + min="$2" + max="$3" + current="$4" + + debug "theme=$theme" + debug "min=$min" + debug "max=$max" + debug "current=$current" + + range=$(echo "($max - $min)"|bc -l) + + quotient=$(echo "scale=4;((${current} - ${min})/${range})"|bc -l) + + glyph_count=$(echo $theme|awk -F\_ '{print $NF}') + + debug "range=$range" + debug "quotient=$quotient" + debug "glyph_count=$glyph_count" + + if [ $glyph_count -eq 2 ] + then + show_rating_theme "$theme" "$min" "$max" "$current" "$quotient" + return + fi + + percent_per_glyph=$(echo "100/$glyph_count"|bc -l) + debug "percent_per_glyph=$percent_per_glyph" + + assert "$percent_per_glyph > 1.0" "width ($width) too great" + + # with this scheme, assuming current value is 0-100 and theme has 10 + # elements: + # + # current glyph from theme + # + # 0-19 1st + # 20-29 2nd + # 30-39 3rd + # : + # 90-99 9th + # 100 10th + i=$(echo|awk \ + -v quotient=$quotient \ + -v glyph_count=$glyph_count \ + '{ + x= int( (quotient * glyph_count) ) - 1; + x = (x > (glyph_count-1) ? (glyph_count-1) : x); + if ( x < 0 ) x = 0; + printf("%d", x); + }') + + debug "index=$i" + eval content="\${$theme[$i]}" + + [ ! -z "$(bc_test "$current == 0")" -a $zero_as_space = y ] && content=' ' + echo $newline "$content" + + return +} + +list_theme() +{ + theme="$1" + eval content="\${$theme[@]}" + echo + for c in $content + do + echo -n "$c " + done + echo -e "\n" +} + +list_themes() +{ + for entry in ${theme_list[@]} + do + for arg in "$entry" + do + echo "$arg" + done + done +} + +theme_valid() +{ + theme="$1" + [ -z "`list_themes|grep "^${theme}$"`" ] && return 1 + return 0 +} + +# XXX: the seemingly pointless 'tr' calls translate unicode dashes (look +# closely!) into ASCII dashes. This is required since 'bc' borks on +# unicode and it is easy to mistakenly pass unicode dashes if you paste +# characters from another application, such as a web-browser. +while getopts "bc:dhilm:nqrt:u:w:x:" opt +do + case "$opt" in + b) + zero_as_space=y + ;; + + c) + current=$(echo $OPTARG|tr '−' '-') + ;; + + d) + debug_enabled=y + ;; + + h) + usage + exit 0 + ;; + + i) + invert=y + ;; + + l) + list=y + ;; + + m) + min=$(echo $OPTARG|tr '−' '-') + ;; + + n) + newline=-n + ;; + + q) + quiet=y + ;; + + r) + reverse=y + ;; + + t) + theme=$OPTARG + ;; + + u) + user_theme="$OPTARG" + ;; + + w) + width=$OPTARG + ;; + + x) + max=$(echo $OPTARG|tr '−' '-') + ;; + esac +done + +shift $[$OPTIND-1] + +if [ ! -z "$user_theme" ] +then + elements=$(echo "$user_theme"|awk '{print NF}') + + assert "$elements >= 2" "user themes need >= 2 values" + + # create new theme + name="_user_${elements}" + eval "$name=($user_theme)" + + # add it to list + theme_list=("${theme_list[@]}" $name) + + [ -z "$theme" ] && theme=$name +fi + +if [ "$list" = y ] +then + if [ -z "$theme" ] + then + list_themes && exit 0 + else + theme_valid "$theme" || die "invalid theme: $theme" + [ "$quiet" = n ] && echo "Listing theme '$theme'" + list_theme $theme && exit 0 + fi +fi +[ -z "$min" ] && min=$min_default +[ -z "$max" ] && max=$max_default +[ -z "$width" ] && width=$width_default + +assert "$min <= $max" "minimum ($min) > maximum ($max)" +assert "$min != $max" "minimum ($min) == maximum" + +[ -z "$current" -a ! -z "$1" ] && current="$1" + +if [ -z "$current" ] +then + error "must specify current value" + usage + exit 1 +fi + +assert "$current >= $min" "current ($current) < minimum ($min)" +assert "$current <= $max" "current ($current) > maximum ($max)" + +[ -z "$theme" ] && theme=$theme_default + +theme_valid "$theme" || die "invalid theme: $theme" + +show_theme_entry $theme $min $max $current + +exit 0 diff --git a/usr/lib/byobu/wastebasket b/usr/lib/byobu/wastebasket new file mode 100755 index 00000000..fba72e71 --- /dev/null +++ b/usr/lib/byobu/wastebasket @@ -0,0 +1,39 @@ +#!/bin/sh -e +# +# wastebasket: show icon (and optionally count) if entries in wastebasket. +# Copyright (C) 2011 Canonical Ltd. +# +# Authors: James Hunt + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +PKG="byobu" +color 2>/dev/null || color() { true; } + +[ "$UTF8" = "1" ] && ICON="♸" || ICON="W" + +dir=$HOME/.local/share/Trash/files + +[ ! -d $dir ] && exit 0 +count=$(ls $dir|wc -l) +[ "$count" -eq 0 ] && exit 0 + +if [ "$1" = "--detail" ] +then + echo -n "${ICON}[$count]" +else + echo -n $ICON +fi + +exit 0 diff --git a/usr/lib/byobu/wifi_quality b/usr/lib/byobu/wifi_quality index 1414ab04..a6cb8197 100755 --- a/usr/lib/byobu/wifi_quality +++ b/usr/lib/byobu/wifi_quality @@ -19,6 +19,7 @@ PKG="byobu" color 2>/dev/null || color() { true; } +[ "$UTF8" = "1" ] && ICON="⚚" || ICON= if [ "$1" = "--detail" ]; then /sbin/iwconfig 2>/dev/null @@ -35,4 +36,4 @@ else quality=`echo "$quality" | awk -F/ '{printf "%.0f", 100*$1/$2}'` fi [ "$quality" = "0" ] && exit 0 -printf "$(color b C k)%s$(color -)$(color C k)%s,$(color -)$(color b C k)%s$(color -)$(color C k)%%$(color -) " "$bitrate" "Mbps" "$quality" +printf "${ICON}$(color b C k)%s$(color -)$(color C k)%s,$(color -)$(color b C k)%s$(color -)$(color C k)%%$(color -) " "$bitrate" "Mbps" "$quality"