mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
bin/*: drop sourcing of /etc/byobu/statusrc, as this is done in
byobu-status now
This commit is contained in:
parent
146a3bbbd5
commit
d8f73555ce
25 changed files with 2 additions and 27 deletions
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
if ls /var/crash/*.crash >/dev/null 2>&1; then
|
if ls /var/crash/*.crash >/dev/null 2>&1; then
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
search () {
|
search () {
|
||||||
local str expr
|
local str expr
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
cat /proc/cpuinfo
|
cat /proc/cpuinfo
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -d "$HOME/.$PKG/bin" ] || exit 0
|
[ -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"
|
[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$HOME/.byobu"
|
||||||
NOW=$(date +%s)
|
NOW=$(date +%s)
|
||||||
CACHE="$DIR/$PKG.custom"
|
CACHE="$DIR/$PKG.custom"
|
||||||
|
|
1
bin/disk
1
bin/disk
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
df -h -P
|
df -h -P
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
DETAIL=0
|
DETAIL=0
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
for arg in $@; do
|
for arg in $@; do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
DIR="/sys/class/hwmon"
|
DIR="/sys/class/hwmon"
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
|
|
|
@ -18,14 +18,12 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
hostname -f
|
hostname -f
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
. "$HOME/.$PKG/status"
|
. "$HOME/.$PKG/status"
|
||||||
[ "$whoami" = "1" ] && at="@"
|
[ "$whoami" = "1" ] && at="@"
|
||||||
|
|
||||||
|
|
|
@ -18,14 +18,12 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
/sbin/ifconfig | grep "inet addr" | sed -e 's/^\s*//' -e 's/\s*$//'
|
/sbin/ifconfig | grep "inet addr" | sed -e 's/^\s*//' -e 's/\s*$//'
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
. "$HOME/.$PKG/status"
|
. "$HOME/.$PKG/status"
|
||||||
[ "$hostname" = "1" ] && space=" "
|
[ "$hostname" = "1" ] && space=" "
|
||||||
[ "$whoami" = "1" ] && space=" "
|
[ "$whoami" = "1" ] && space=" "
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
cat /proc/loadavg
|
cat /proc/loadavg
|
||||||
|
|
1
bin/logo
1
bin/logo
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
MARKUP="false"
|
MARKUP="false"
|
||||||
|
|
1
bin/mail
1
bin/mail
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
mailfile="/var/spool/mail/$USER"
|
mailfile="/var/spool/mail/$USER"
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
|
|
|
@ -18,14 +18,12 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
free
|
free
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
. "$HOME/.$PKG/status"
|
. "$HOME/.$PKG/status"
|
||||||
[ "$mem_used" = "1" ] && comma="," || whitespace=" "
|
[ "$mem_used" = "1" ] && comma="," || whitespace=" "
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
cat /proc/meminfo
|
cat /proc/meminfo
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
# Allow interface overrides in $HOME/.$PKG/status
|
# Allow interface overrides in $HOME/.$PKG/status
|
||||||
if [ -n "$MONITORED_NETWORK" ]; then
|
if [ -n "$MONITORED_NETWORK" ]; then
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
ps -ejH
|
ps -ejH
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
reboot="/var/run/reboot-required"
|
reboot="/var/run/reboot-required"
|
||||||
[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$HOME/.byobu"
|
[ -d "/var/run/screen/S-$USER" ] && DIR="/var/run/screen/S-$USER" || DIR="$HOME/.byobu"
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
cat /etc/issue
|
cat /etc/issue
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
DIR="/proc/acpi/thermal_zone"
|
DIR="/proc/acpi/thermal_zone"
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
DIR="/proc/acpi/thermal_zone"
|
DIR="/proc/acpi/thermal_zone"
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" -o "$1" = "--short" ]; then
|
if [ "$1" = "--detail" -o "$1" = "--short" ]; then
|
||||||
if which apt-get >/dev/null; then
|
if which apt-get >/dev/null; then
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
uptime
|
uptime
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
ps -ef | grep "sshd;.*@" | grep -v grep
|
ps -ef | grep "sshd;.*@" | grep -v grep
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
|
|
||||||
|
|
||||||
if [ "$1" = "--detail" ]; then
|
if [ "$1" = "--detail" ]; then
|
||||||
/sbin/iwconfig 2>/dev/null
|
/sbin/iwconfig 2>/dev/null
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -61,6 +61,8 @@ byobu (2.40) unreleased; urgency=low
|
||||||
* debian/install, rpm/byobu.spec, byobu-launcher-install,
|
* debian/install, rpm/byobu.spec, byobu-launcher-install,
|
||||||
byobu-launcher-uninstall, byobu-janitor: put the launcher install and
|
byobu-launcher-uninstall, byobu-janitor: put the launcher install and
|
||||||
uninstall utilities in /usr/bin
|
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
|
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 10 Nov 2009 10:18:20 -0600
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue