get the update-motd hook working properly

This commit is contained in:
Dustin Kirkland 2010-11-03 20:39:13 -05:00
commit 6dfb9e05fc
7 changed files with 6 additions and 8 deletions

View file

@ -1,5 +1,4 @@
SUBDIRS = etc/byobu \
etc/update-motd.d \
usr/share/applications \
usr/share/byobu/ec2 \
usr/share/byobu/keybindings \

View file

@ -17,7 +17,6 @@ AM_INIT_AUTOMAKE(byobu, 3.0)
AC_OUTPUT(Makefile \
etc/byobu/Makefile \
etc/update-motd.d/Makefile \
usr/share/applications/Makefile \
usr/share/byobu/ec2/Makefile \
usr/share/byobu/keybindings/Makefile \

1
debian/install vendored
View file

@ -1,4 +1,5 @@
/usr
../../etc/update-motd.d/55-window-manager etc/update-motd.d
../../etc/byobu/socketdir etc/byobu/
../../etc/byobu/statusrc etc/byobu/
../../debian/source_byobu.py usr/share/apport/package-hooks

View file

@ -1,2 +0,0 @@
etcdir = $(datadir)/update-motd.d
etc_DATA = 55-window-manager

View file

@ -1,2 +1,2 @@
bin_SCRIPTS = byobu byobu-config byobu-export byobu-janitor byobu-launch byobu-launcher byobu-launcher-install byobu-launcher-uninstall byobu-reconnect-sockets byobu-select-profile byobu-select-session byobu-status byobu-status-detail shell
bin_SCRIPTS = byobu byobu-config byobu-disable byobu-enable byobu-export byobu-janitor byobu-launch byobu-launcher byobu-launcher-install byobu-launcher-uninstall byobu-reconnect-sockets byobu-select-profile byobu-select-session byobu-status byobu-status-detail shell

View file

@ -25,5 +25,3 @@ echo
echo "To re-enable this behavior later, just run:"
echo " byobu-enable"
echo
echo -n "Press <enter> to continue..."
$(head -n1)

View file

@ -17,5 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
[ -r /etc/motd ] && cat /etc/motd
if [ -r /etc/motd ]; then
# Prune the byobu advert, if you're already running within byobu
grep -v "^For a superior command line experience, enable our text-based window manger" /etc/motd | grep -v "^ byobu-enable"
fi
[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh