bin/*: drop sourcing of /etc/byobu/statusrc, as this is done in

byobu-status now
This commit is contained in:
Dustin Kirkland 2009-12-12 10:44:38 -08:00
commit d8f73555ce
25 changed files with 2 additions and 27 deletions

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
if ls /var/crash/*.crash >/dev/null 2>&1; then

View file

@ -19,7 +19,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
search () {
local str expr

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
cat /proc/cpuinfo

View file

@ -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"

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
df -h -P

View file

@ -19,7 +19,6 @@
DETAIL=0
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
for arg in $@; do
case "$arg" in

View file

@ -19,7 +19,6 @@
#
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
DIR="/sys/class/hwmon"
if [ "$1" = "--detail" ]; then

View file

@ -18,14 +18,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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="@"

View file

@ -18,14 +18,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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=" "

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
cat /proc/loadavg

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
MARKUP="false"

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
mailfile="/var/spool/mail/$USER"
if [ "$1" = "--detail" ]; then

View file

@ -18,14 +18,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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=" "

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
cat /proc/meminfo

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
# Allow interface overrides in $HOME/.$PKG/status
if [ -n "$MONITORED_NETWORK" ]; then

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
ps -ejH

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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"

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
cat /etc/issue

View file

@ -19,7 +19,6 @@
#
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
DIR="/proc/acpi/thermal_zone"
if [ "$1" = "--detail" ]; then

View file

@ -19,7 +19,6 @@
#
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
DIR="/proc/acpi/thermal_zone"
if [ "$1" = "--detail" ]; then

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" -o "$1" = "--short" ]; then
if which apt-get >/dev/null; then

View file

@ -21,7 +21,6 @@
#
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
uptime

View file

@ -21,7 +21,6 @@
#
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
ps -ef | grep "sshd;.*@" | grep -v grep

View file

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
PKG="byobu"
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
if [ "$1" = "--detail" ]; then
/sbin/iwconfig 2>/dev/null

2
debian/changelog vendored
View file

@ -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 <kirkland@ubuntu.com> Tue, 10 Nov 2009 10:18:20 -0600