mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 06:23:19 -07:00
* byobu, debian/install, motd+shell, profiles/byoburc: launch screen
with a simple config file that includes the chosen profile plus the chosen windows; but on refresh, only reload the chosen profile; revert previous hack that did this by creating a temporary config file and broke on hardy, LP: #375309 Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
parent
f423285213
commit
ef3262d447
5 changed files with 31 additions and 7 deletions
6
byobu
6
byobu
|
@ -97,12 +97,8 @@ sed -i "s/$OLDPKG/$PKG/g" "$HOME/.$PKG/keybindings"
|
|||
|
||||
# Now let's execute screen!
|
||||
if [ "$#" = "0" ]; then
|
||||
# Create a temporary config file *with* the default windows
|
||||
# but if we refresh, we'll just source the profile, without
|
||||
temp=$(mktemp -t $PKG-XXXXXXXX)
|
||||
cat "$HOME/.$PKG/profile" "$HOME/.$PKG/windows" > "$temp"
|
||||
[ -n "$SHELL" -a -x "$SHELL" ] || SHELL="/bin/sh"
|
||||
exec $SCREEN_REAL -c "$temp" $SHELL /usr/bin/motd+shell "$temp"
|
||||
exec $SCREEN_REAL -c "/usr/share/$PKG/profiles/byoburc" $SHELL /usr/bin/motd+shell
|
||||
else
|
||||
exec $SCREEN_REAL -c "$HOME/.$PKG/profile" "$@"
|
||||
fi
|
||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -13,12 +13,17 @@ byobu (2.4) unreleased; urgency=low
|
|||
* bin/ip-address: hostname -i doesn't always work, use ifconfig
|
||||
instead, LP: #376080
|
||||
* byobu-export: tar files with owner/group as root/root, LP: #371025
|
||||
* byobu, debian/install, motd+shell, profiles/byoburc: launch screen
|
||||
with a simple config file that includes the chosen profile plus
|
||||
the chosen windows; but on refresh, only reload the chosen profile;
|
||||
revert previous hack that did this by creating a temporary config
|
||||
file and broke on hardy, LP: #375309
|
||||
* debian/control: suggest vim, for better handling of status details
|
||||
|
||||
[ David Duffey ]
|
||||
* rpm/byobu.spec: initial specfile for RH packaging
|
||||
|
||||
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 14 May 2009 00:55:35 -0500
|
||||
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 14 May 2009 13:03:53 -0500
|
||||
|
||||
byobu (2.3-0ubuntu1) karmic; urgency=low
|
||||
|
||||
|
|
1
debian/install
vendored
1
debian/install
vendored
|
@ -1,5 +1,6 @@
|
|||
bin/* usr/lib/byobu
|
||||
po/locale/* usr/share/locale
|
||||
profiles/byoburc usr/share/byobu/profiles
|
||||
profiles/common usr/share/byobu/profiles
|
||||
profiles/NONE usr/share/byobu/profiles
|
||||
profiles/black usr/share/byobu/profiles
|
||||
|
|
|
@ -18,5 +18,4 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
[ -r /etc/motd ] && cat /etc/motd
|
||||
[ -n "$1" -a -w "$1" ] && rm -f "$1" 2>/dev/null
|
||||
[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh
|
||||
|
|
23
profiles/byoburc
Normal file
23
profiles/byoburc
Normal file
|
@ -0,0 +1,23 @@
|
|||
###############################################################################
|
||||
# Load both the profile, and the default windows, used at startup but not
|
||||
# profile refresh
|
||||
#
|
||||
# Copyright (C) 2009 Canonical Ltd.
|
||||
#
|
||||
# Authors: Dustin Kirkland <kirkland@canonical.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, version 3 of the License.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
###############################################################################
|
||||
|
||||
source $HOME/.byobu/profile
|
||||
source $HOME/.byobu/windows
|
Loading…
Add table
Add a link
Reference in a new issue