From d8f73555cee56fd6074cadb00eb7ba9f7fd30e5d Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 12 Dec 2009 10:44:38 -0800 Subject: [PATCH] bin/*: drop sourcing of /etc/byobu/statusrc, as this is done in byobu-status now --- bin/apport | 1 - bin/battery | 1 - bin/cpu_freq | 1 - bin/custom | 1 - bin/disk | 1 - bin/ec2_cost | 1 - bin/fan_speed | 1 - bin/hostname | 2 -- bin/ip_address | 2 -- bin/load_average | 1 - bin/logo | 1 - bin/mail | 1 - bin/mem_available | 2 -- bin/mem_used | 1 - bin/network | 1 - bin/processes | 1 - bin/reboot_required | 1 - bin/release | 1 - bin/temp_c | 1 - bin/temp_f | 1 - bin/updates_available | 1 - bin/uptime | 1 - bin/users | 1 - bin/wifi_quality | 1 - debian/changelog | 2 ++ 25 files changed, 2 insertions(+), 27 deletions(-) diff --git a/bin/apport b/bin/apport index 8427c18b..3b370423 100755 --- a/bin/apport +++ b/bin/apport @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then if ls /var/crash/*.crash >/dev/null 2>&1; then diff --git a/bin/battery b/bin/battery index 405d537f..e8d2638f 100755 --- a/bin/battery +++ b/bin/battery @@ -19,7 +19,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" search () { local str expr diff --git a/bin/cpu_freq b/bin/cpu_freq index c9e619a6..0f49c441 100755 --- a/bin/cpu_freq +++ b/bin/cpu_freq @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then cat /proc/cpuinfo diff --git a/bin/custom b/bin/custom index 23e9f5e6..a7cd9edd 100755 --- a/bin/custom +++ b/bin/custom @@ -21,7 +21,6 @@ PKG="byobu" [ -d "$HOME/.$PKG/bin" ] || exit 0 -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" [ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$HOME/.byobu" NOW=$(date +%s) CACHE="$DIR/$PKG.custom" diff --git a/bin/disk b/bin/disk index 219e53f8..19643b23 100755 --- a/bin/disk +++ b/bin/disk @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then df -h -P diff --git a/bin/ec2_cost b/bin/ec2_cost index 19b7d7b5..814db8fd 100755 --- a/bin/ec2_cost +++ b/bin/ec2_cost @@ -19,7 +19,6 @@ DETAIL=0 PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" for arg in $@; do case "$arg" in diff --git a/bin/fan_speed b/bin/fan_speed index f0684a19..47a4fe7a 100755 --- a/bin/fan_speed +++ b/bin/fan_speed @@ -19,7 +19,6 @@ # PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" DIR="/sys/class/hwmon" if [ "$1" = "--detail" ]; then diff --git a/bin/hostname b/bin/hostname index 125ed863..1b8133b6 100755 --- a/bin/hostname +++ b/bin/hostname @@ -18,14 +18,12 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then hostname -f exit 0 fi -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" . "$HOME/.$PKG/status" [ "$whoami" = "1" ] && at="@" diff --git a/bin/ip_address b/bin/ip_address index 3e633b69..9c607a8b 100755 --- a/bin/ip_address +++ b/bin/ip_address @@ -18,14 +18,12 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then /sbin/ifconfig | grep "inet addr" | sed -e 's/^\s*//' -e 's/\s*$//' exit 0 fi -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" . "$HOME/.$PKG/status" [ "$hostname" = "1" ] && space=" " [ "$whoami" = "1" ] && space=" " diff --git a/bin/load_average b/bin/load_average index b2224e1a..0e995b92 100755 --- a/bin/load_average +++ b/bin/load_average @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then cat /proc/loadavg diff --git a/bin/logo b/bin/logo index 6f9ee108..802c1797 100755 --- a/bin/logo +++ b/bin/logo @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then MARKUP="false" diff --git a/bin/mail b/bin/mail index 7421be47..73f91b5a 100755 --- a/bin/mail +++ b/bin/mail @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" mailfile="/var/spool/mail/$USER" if [ "$1" = "--detail" ]; then diff --git a/bin/mem_available b/bin/mem_available index f6dd4627..dced60a0 100755 --- a/bin/mem_available +++ b/bin/mem_available @@ -18,14 +18,12 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then free exit 0 fi -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" . "$HOME/.$PKG/status" [ "$mem_used" = "1" ] && comma="," || whitespace=" " diff --git a/bin/mem_used b/bin/mem_used index d9911afd..87a21c9b 100755 --- a/bin/mem_used +++ b/bin/mem_used @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then cat /proc/meminfo diff --git a/bin/network b/bin/network index f09e112e..08093f18 100755 --- a/bin/network +++ b/bin/network @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" # Allow interface overrides in $HOME/.$PKG/status if [ -n "$MONITORED_NETWORK" ]; then diff --git a/bin/processes b/bin/processes index 5e9bb220..49289a18 100755 --- a/bin/processes +++ b/bin/processes @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then ps -ejH diff --git a/bin/reboot_required b/bin/reboot_required index 486e1790..e0af70b3 100755 --- a/bin/reboot_required +++ b/bin/reboot_required @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" reboot="/var/run/reboot-required" [ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$HOME/.byobu" diff --git a/bin/release b/bin/release index fcfab00c..146d4f1f 100755 --- a/bin/release +++ b/bin/release @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then cat /etc/issue diff --git a/bin/temp_c b/bin/temp_c index 2d9032b4..bb3239e0 100755 --- a/bin/temp_c +++ b/bin/temp_c @@ -19,7 +19,6 @@ # PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" DIR="/proc/acpi/thermal_zone" if [ "$1" = "--detail" ]; then diff --git a/bin/temp_f b/bin/temp_f index 3a265d0d..52415d45 100755 --- a/bin/temp_f +++ b/bin/temp_f @@ -19,7 +19,6 @@ # PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" DIR="/proc/acpi/thermal_zone" if [ "$1" = "--detail" ]; then diff --git a/bin/updates_available b/bin/updates_available index ea775e81..099f6180 100755 --- a/bin/updates_available +++ b/bin/updates_available @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" -o "$1" = "--short" ]; then if which apt-get >/dev/null; then diff --git a/bin/uptime b/bin/uptime index cb47f88e..6a310266 100755 --- a/bin/uptime +++ b/bin/uptime @@ -21,7 +21,6 @@ # PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then uptime diff --git a/bin/users b/bin/users index 3e9b12f2..c65f3299 100755 --- a/bin/users +++ b/bin/users @@ -21,7 +21,6 @@ # PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then ps -ef | grep "sshd;.*@" | grep -v grep diff --git a/bin/wifi_quality b/bin/wifi_quality index 74e267f4..6142e823 100755 --- a/bin/wifi_quality +++ b/bin/wifi_quality @@ -18,7 +18,6 @@ # along with this program. If not, see . PKG="byobu" -[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc" if [ "$1" = "--detail" ]; then /sbin/iwconfig 2>/dev/null diff --git a/debian/changelog b/debian/changelog index 2078c75a..3118bf12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ byobu (2.40) unreleased; urgency=low * debian/install, rpm/byobu.spec, byobu-launcher-install, byobu-launcher-uninstall, byobu-janitor: put the launcher install and uninstall utilities in /usr/bin + * bin/*: drop sourcing of /etc/byobu/statusrc, as this is done in + byobu-status now -- Dustin Kirkland Tue, 10 Nov 2009 10:18:20 -0600