github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 06:23:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/disk_io: fix scaling, LP: #787773

Browse source 
* usr/bin/byobu-disable, usr/bin/byobu-select-session, usr/bin/shell:
  - fix some of the messaging
  - add a welcome message with the toggle on/off info
  - fix the motd display at auto launch, which was broken recently
This commit is contained in:
Dustin Kirkland 2011-05-25 15:53:55 -05:00
commit 652d81aabb
4 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
debian/changelog vendored
View file

@ -1,22 +1,13 @@
byobu (4.4) unreleased; urgency=low
* UNRELEASED
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 24 May 2011 22:29:05 -0500
byobu (4.3-0ubuntu1) oneiric; urgency=low
* usr/lib/byobu/uptime: fix string bug in uptime introduced by smoser's
changes
* usr/lib/byobu/disk_io: fix scaling, LP: #787773
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 24 May 2011 22:29:00 -0500
byobu (4.3) unreleased; urgency=low byobu (4.3) unreleased; urgency=low
[ Dustin Kirkland ] [ Dustin Kirkland ]
* usr/lib/byobu/uptime: fix string bug in uptime introduced by smoser's * usr/lib/byobu/uptime: fix string bug in uptime introduced by smoser's
changes changes
* usr/lib/byobu/disk_io: fix scaling, LP: #787773
* usr/bin/byobu-disable, usr/bin/byobu-select-session, usr/bin/shell:
- fix some of the messaging
- add a welcome message with the toggle on/off info
- fix the motd display at auto launch, which was broken recently
[ Scott Moser ] [ Scott Moser ]
* usr/lib/byobu/.shutil: fix rounding across a decimal point in fpdiv() * usr/lib/byobu/.shutil: fix rounding across a decimal point in fpdiv()

9
usr/bin/byobu-disable
View file

@ -20,8 +20,15 @@
byobu-launcher-uninstall byobu-launcher-uninstall
echo echo
echo "The Byobu window manager will no longer be launched automatically at each text login." echo "The Byobu window manager will no longer be launched automatically at login."
echo echo
echo "To re-enable this behavior later, just run:" echo "To re-enable this behavior later, just run:"
echo " byobu-enable" echo " byobu-enable"
echo echo
# If we're in a byobu session, let's exit that too
case "$STY" in
*byobu)
screen -X at 0 quit
;;
esac

2
usr/bin/byobu-select-session
View file

@ -65,6 +65,8 @@ if i > 1:
tries += 1 tries += 1
choice = "" choice = ""
sys.stderr.write("\nERROR: Invalid input\n"); sys.stderr.write("\nERROR: Invalid input\n");
else:
os.execvp("byobu", ["", "shell"])
if choice: if choice:
if choice == i-1: if choice == i-1:

19
usr/bin/shell
View file

@ -17,8 +17,21 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
if [ -r /etc/motd ]; then PKG="byobu"
# Prune the byobu advert, if you're already running within byobu FLAG="$HOME/.$PKG/.welcome-displayed"
grep -v "^For a superior command line experience, enable our text-based window manger" /etc/motd | grep -v "^ byobu-enable"
[ -r /etc/motd ] && cat /etc/motd
if [ ! -e "$FLAG" ]; then
echo
echo "Welcome to Ubuntu's powerful, text-based window manager, Byobu."
echo "You can toggle the launch of Byobu at login with:"
echo " 'byobu-disable' and 'byobu-enable'"
echo
echo "For tips, tricks, and more information, see:"
echo " * https://help.ubuntu.com/community/Byobu"
echo
touch "$FLAG"
fi fi
[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh [ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh