byobu

Merge lp:~mathiaz/byobu/launcher-exists into lp:byobu

  1. launcher-exists
  2. Merge into trunk
Proposed by Mathias Gug
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mathiaz/byobu/launcher-exists
Merge into: lp:byobu
Diff against target: None lines
To merge this branch: bzr merge lp:~mathiaz/byobu/launcher-exists
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Review via email: mp+11229@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'byobu-launcher-install'
2--- byobu-launcher-install 2009-06-23 07:30:59 +0000
3+++ byobu-launcher-install 2009-09-04 19:42:27 +0000
4@@ -23,7 +23,7 @@
5 install_launcher() {
6 dest=$1
7 launcher="byobu-launcher"
8- launcher_line="\`echo \$- | grep -qs i\` && $launcher"
9+ launcher_line="\`echo \$- | grep -qs i\` && which $launcher > /dev/null && $launcher"
10 # Add it at the end
11 echo "$launcher_line" >> "$dest"
12 # Hush login, since byobu will handle motd printing
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2009-09-01 00:30:20 +0000
16+++ debian/changelog 2009-09-04 19:42:27 +0000
17@@ -1,7 +1,12 @@
18 byobu (2.31) unreleased; urgency=low
19
20+ [ Dustin Kirkland ]
21 * UNRELEASED
22
23+ [ Mathias Gug ]
24+ * Check that byobu-launcher exists before calling it (chroots use the same
25+ .profile as the main system but may not have byobu installed).
26+
27 -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 31 Aug 2009 19:30:20 -0500
28
29 byobu (2.30-0ubuntu1) karmic; urgency=low

Subscribers

People subscribed via source and target branches