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/bin/byobu-launcher-uninstall.in, usr/bin/byobu-launch.in: LP: #1292228

Browse source 
- allow byobu-launch to pass arguments through to byobu-launcher
  - fix up the uninstallation of byobu launcher
This commit is contained in:
Dustin Kirkland 2014-03-17 09:46:27 +09:00
commit 678e6348d2
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -15,6 +15,9 @@ byobu (5.75) unreleased; urgency=medium
- have the constants source that file - have the constants source that file
- use that file when creating the user's local color palette - use that file when creating the user's local color palette
- use a bit more orange - use a bit more orange
* usr/bin/byobu-launcher-uninstall.in, usr/bin/byobu-launch.in: LP: #1292228
- allow byobu-launch to pass arguments through to byobu-launcher
- fix up the uninstallation of byobu launcher
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 16 Mar 2014 12:46:36 -0700 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 16 Mar 2014 12:46:36 -0700

2
usr/bin/byobu-launch.in
View file

@ -61,7 +61,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
[ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="history -a;history -r;$PROMPT_COMMAND" || PROMPT_COMMAND="history -a;history -r" [ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="history -a;history -r;$PROMPT_COMMAND" || PROMPT_COMMAND="history -a;history -r"
# Source profile, if necessary # Source profile, if necessary
[ -z "$_byobu_sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile" [ -z "$_byobu_sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile"
if byobu-launcher; then if byobu-launcher "$@" ; then
# Wait very briefly for the no-logout flag to get written? # Wait very briefly for the no-logout flag to get written?
sleep 0.1 sleep 0.1
if [ -e "$BYOBU_CONFIG_DIR/no-logout-on-detach" ] || [ -e "$BYOBU_RUN_DIR/no-logout" ]; then if [ -e "$BYOBU_CONFIG_DIR/no-logout-on-detach" ] || [ -e "$BYOBU_RUN_DIR/no-logout" ]; then

2
usr/bin/byobu-launcher-uninstall.in
View file

@ -27,7 +27,7 @@ remove_launcher() {
dest=$1 dest=$1
if [ -w "$dest" ]; then if [ -w "$dest" ]; then
# keep any comments, and remove lines invoking byobu: # keep any comments, and remove lines invoking byobu:
$BYOBU_SED -i -e '/^\s*#/n' -e "/\b$PKG-launch\$/d" -e "/ screen-launch/d" "$dest" -e "/byobu-launcher$/d" $BYOBU_SED -i -e '/^\s*#/n' -e "/\b$PKG-launch/d" -e "/\bscreen-launch/d" "$dest"
fi fi
} }