mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-21 22:13:19 -07:00
add Dustin to the authors
fix indentation in screen-install rework screen-install to simply add the execution of /usr/bin/screen-launcher to .bashrc ditch the symlinking to ~/.screen-launcher
This commit is contained in:
parent
8a0c193117
commit
b7bb347bea
2 changed files with 12 additions and 21 deletions
|
@ -4,6 +4,7 @@
|
||||||
# Copyright (C) 2008 Canonical Ltd.
|
# Copyright (C) 2008 Canonical Ltd.
|
||||||
#
|
#
|
||||||
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
||||||
|
# Dustin Kirkland <kirkland@canonical.com>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
@ -20,11 +21,11 @@
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
|
||||||
LAUNCHER="$HOME/.screen-launcher"
|
LAUNCHER="/usr/bin/screen-launcher"
|
||||||
BASHRC="$HOME/.bashrc"
|
BASHRC="$HOME/.bashrc"
|
||||||
|
|
||||||
# We have to make sure screen is called last
|
# We have to make sure screen is called last
|
||||||
pos=$(( $(grep -ns "source $LAUNCHER" "$BASHRC" | sed 's/:.*$//' | head -1) ))
|
pos=$(( $(grep -ns "$LAUNCHER" "$BASHRC" | sed 's/:.*$//' | head -1) ))
|
||||||
|
|
||||||
do=0
|
do=0
|
||||||
if [ $pos -gt 0 ]; then
|
if [ $pos -gt 0 ]; then
|
||||||
|
@ -40,16 +41,5 @@ fi
|
||||||
|
|
||||||
# Add it at the end
|
# Add it at the end
|
||||||
if [ $do -eq 1 ]; then
|
if [ $do -eq 1 ]; then
|
||||||
echo "source $LAUNCHER" >> "$BASHRC"
|
echo "$LAUNCHER" >> "$BASHRC"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure that ~/.screen-launcher is a symbolic link
|
|
||||||
if [ -e "$HOME/.screen-launcher" ]; then
|
|
||||||
if [ ! -L "$HOME/.screen-launcher" ]; then
|
|
||||||
echo `gettext 'Error:'` $HOME/.screen-launcher `gettext ' file exists, but is not a symlink'`
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
ln -s /usr/share/screen-profiles/screen-launcher "$HOME/.screen-launcher"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
# Copyright (C) 2008 Canonical Ltd.
|
# Copyright (C) 2008 Canonical Ltd.
|
||||||
#
|
#
|
||||||
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
# Authors: Nick Barcet <nick.barcet@ubuntu.com>
|
||||||
|
# Dustin Kirkland <kirkland@canonical.com>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue