From 4a7e06f363e22961545767aecefa0cfcf978cfa1 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 12 Jan 2010 08:46:44 -0600 Subject: [PATCH] * usr/lib/byobu/network: fix network script regresssion, LP: #506315 * usr/lib/byobu/wifi_quality: silence error - debian/install, usr/bin/*: move the binary scripts --- debian/changelog | 4 +++- debian/install | 13 +------------ po/POTFILES.Python | 2 +- po/POTFILES.Shell | 4 ++-- testing/time_notifications | 7 ++++--- byobu => usr/bin/byobu | 0 byobu-config => usr/bin/byobu-config | 0 byobu-export => usr/bin/byobu-export | 0 byobu-janitor => usr/bin/byobu-janitor | 0 byobu-launcher => usr/bin/byobu-launcher | 0 .../bin/byobu-launcher-install | 0 .../bin/byobu-launcher-uninstall | 0 .../bin/byobu-reconnect-sockets | 0 .../bin/byobu-select-profile | 0 byobu-status => usr/bin/byobu-status | 0 byobu-status-detail => usr/bin/byobu-status-detail | 0 motd+shell => usr/bin/motd+shell | 0 usr/lib/byobu/wifi_quality | 2 +- 18 files changed, 12 insertions(+), 20 deletions(-) rename byobu => usr/bin/byobu (100%) rename byobu-config => usr/bin/byobu-config (100%) rename byobu-export => usr/bin/byobu-export (100%) rename byobu-janitor => usr/bin/byobu-janitor (100%) rename byobu-launcher => usr/bin/byobu-launcher (100%) rename byobu-launcher-install => usr/bin/byobu-launcher-install (100%) rename byobu-launcher-uninstall => usr/bin/byobu-launcher-uninstall (100%) rename byobu-reconnect-sockets => usr/bin/byobu-reconnect-sockets (100%) rename byobu-select-profile => usr/bin/byobu-select-profile (100%) rename byobu-status => usr/bin/byobu-status (100%) rename byobu-status-detail => usr/bin/byobu-status-detail (100%) rename motd+shell => usr/bin/motd+shell (100%) diff --git a/debian/changelog b/debian/changelog index 8ddeb0cb..65808c43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ byobu (2.47) unreleased; urgency=low - * bin/network: fix network script regresssion, LP: #506315 + * usr/lib/byobu/network: fix network script regresssion, LP: #506315 + * usr/lib/byobu/wifi_quality: silence error * Make byobu more portable, LP: #503554 - debian/rules, debian/manpages, usr/share/man/man1/*: move the manpages to make byobu more portable - debian/install, bin/*, usr/lib/byobu/*: move the status scripts - debian/install, usr/share/byobu/*: move the share files + - debian/install, usr/bin/*: move the binary scripts -- Dustin Kirkland Mon, 11 Jan 2010 22:54:36 -0600 diff --git a/debian/install b/debian/install index 325565a5..2bed3378 100644 --- a/debian/install +++ b/debian/install @@ -1,20 +1,9 @@ +usr/bin/* usr/lib/byobu/* #desktop/byobu.svg usr/share/byobu/pixmaps/ #desktop/byobu.desktop usr/share/applications/ po/locale/* usr/share/locale usr/share/byobu/* statusrc etc/byobu -byobu-select-profile usr/bin -byobu usr/bin -byobu-config usr/bin -byobu-reconnect-sockets usr/bin -byobu-status usr/bin -byobu-status-detail usr/bin -byobu-janitor usr/bin -byobu-launcher-install usr/bin -byobu-launcher-uninstall usr/bin -motd+shell usr/bin -byobu-launcher usr/bin -byobu-export usr/bin debian/source_byobu.py usr/share/apport/package-hooks debian/lintian/byobu usr/share/lintian/overrides diff --git a/po/POTFILES.Python b/po/POTFILES.Python index 78e588ee..5227ac99 100644 --- a/po/POTFILES.Python +++ b/po/POTFILES.Python @@ -1,3 +1,3 @@ # List of source files containing translatable Python strings. # Please keep this file sorted alphabetically. -byobu-config +usr/bin/byobu-config diff --git a/po/POTFILES.Shell b/po/POTFILES.Shell index de266bf4..1cb50784 100644 --- a/po/POTFILES.Shell +++ b/po/POTFILES.Shell @@ -1,5 +1,5 @@ # List of source files containing translatable sh strings. # Please keep this file sorted alphabetically. usr/lib/byobu/menu -byobu-export -byobu-select-profile +usr/bin/byobu-export +usr/bin/byobu-select-profile diff --git a/testing/time_notifications b/testing/time_notifications index 89b14bc9..e0362e99 100755 --- a/testing/time_notifications +++ b/testing/time_notifications @@ -1,10 +1,11 @@ #!/bin/bash +PKG=byobu RUNS=100 loop() { for j in $(seq 1 $RUNS); do - ./bin/$1 >/dev/null + /usr/lib/$PKG/$1 >/dev/null done } @@ -12,10 +13,10 @@ TIMEFORMAT="%R" if [ -n "$1" ]; then list="$1" else - list=$(ls bin) + list=$(ls /usr/lib/$PKG/) fi for i in $list; do - freq=`grep "byobu-status $i" ./profiles/common | awk '{print $3}'` + freq=`grep "byobu-status $i" /usr/share/$PKG/profiles/common | awk '{print $3}'` echo -n "$i $freq " time loop $i done diff --git a/byobu b/usr/bin/byobu similarity index 100% rename from byobu rename to usr/bin/byobu diff --git a/byobu-config b/usr/bin/byobu-config similarity index 100% rename from byobu-config rename to usr/bin/byobu-config diff --git a/byobu-export b/usr/bin/byobu-export similarity index 100% rename from byobu-export rename to usr/bin/byobu-export diff --git a/byobu-janitor b/usr/bin/byobu-janitor similarity index 100% rename from byobu-janitor rename to usr/bin/byobu-janitor diff --git a/byobu-launcher b/usr/bin/byobu-launcher similarity index 100% rename from byobu-launcher rename to usr/bin/byobu-launcher diff --git a/byobu-launcher-install b/usr/bin/byobu-launcher-install similarity index 100% rename from byobu-launcher-install rename to usr/bin/byobu-launcher-install diff --git a/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall similarity index 100% rename from byobu-launcher-uninstall rename to usr/bin/byobu-launcher-uninstall diff --git a/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets similarity index 100% rename from byobu-reconnect-sockets rename to usr/bin/byobu-reconnect-sockets diff --git a/byobu-select-profile b/usr/bin/byobu-select-profile similarity index 100% rename from byobu-select-profile rename to usr/bin/byobu-select-profile diff --git a/byobu-status b/usr/bin/byobu-status similarity index 100% rename from byobu-status rename to usr/bin/byobu-status diff --git a/byobu-status-detail b/usr/bin/byobu-status-detail similarity index 100% rename from byobu-status-detail rename to usr/bin/byobu-status-detail diff --git a/motd+shell b/usr/bin/motd+shell similarity index 100% rename from motd+shell rename to usr/bin/motd+shell diff --git a/usr/lib/byobu/wifi_quality b/usr/lib/byobu/wifi_quality index 06b0201b..fa25a375 100755 --- a/usr/lib/byobu/wifi_quality +++ b/usr/lib/byobu/wifi_quality @@ -27,6 +27,6 @@ fi iwconfig=`/sbin/iwconfig 2>/dev/null` bitrate=`echo "$iwconfig" | grep "Bit Rate." | sed -e "s/^.*Bit Rate.//" -e "s/ .*$//g"` -[ -z "$bitrate" ] && bitrate="0" +[ -z "$bitrate" ] && exit 0 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 -)$(color C k)%s,$(color -)$(color b C k)%s$(color -)$(color C k)%%$(color -) " "$bitrate" "Mbps" "$quality"