mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-21 05:53:22 -07:00
massive changeset to use BYOBU_PREFIX and allow for relocation (or installation as non-root)
This commit is contained in:
parent
e6171401ac
commit
be50c29d9e
8 changed files with 19 additions and 7 deletions
|
@ -19,7 +19,14 @@
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
VERSION=2.83
|
VERSION=2.83
|
||||||
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
|
[ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr"
|
||||||
|
export BYOBU_PREFIX
|
||||||
|
|
||||||
|
if [ ! -x "$BYOBU_PREFIX/bin/$PKG" ]; then
|
||||||
|
echo "ERROR: Cannot find $BYOBU_PREFIX/bin/$PKG" 2>&1
|
||||||
|
echo "ERROR: If you have installed it elsewhere, export BYOBU_PREFIX in your shell" 2>&1
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Add a version argument for debugging purposes
|
# Add a version argument for debugging purposes
|
||||||
if [ "$#" = "1" ] && [ "$1" = "-v" ]; then
|
if [ "$#" = "1" ] && [ "$1" = "-v" ]; then
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
|
[ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr"
|
||||||
[ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" || SOCKETDIR="/var/run/screen"
|
[ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" || SOCKETDIR="/var/run/screen"
|
||||||
RUN="$SOCKETDIR/S-$USER"
|
RUN="$SOCKETDIR/S-$USER"
|
||||||
FLAG="$RUN/$PKG.reload-required"
|
FLAG="$RUN/$PKG.reload-required"
|
||||||
|
|
|
@ -17,7 +17,8 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
|
[ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr"
|
||||||
|
export BYOBU_PREFIX
|
||||||
|
|
||||||
if [ ! -e "$HOME/.byobu/disable-autolaunch" ]; then
|
if [ ! -e "$HOME/.byobu/disable-autolaunch" ]; then
|
||||||
case "$TERM" in
|
case "$TERM" in
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
# ./debian/rules get-po
|
# ./debian/rules get-po
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
|
[ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr"
|
||||||
|
export BYOBU_PREFIX
|
||||||
[ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" || SOCKETDIR="/var/run/screen"
|
[ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" || SOCKETDIR="/var/run/screen"
|
||||||
|
|
||||||
TEXTDOMAIN="$PKG"
|
TEXTDOMAIN="$PKG"
|
||||||
|
|
|
@ -18,7 +18,8 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
PKG="byobu"
|
PKG="byobu"
|
||||||
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
|
[ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr"
|
||||||
|
export BYOBU_PREFIX
|
||||||
|
|
||||||
find_script () {
|
find_script () {
|
||||||
# Allow for local status scripts
|
# Allow for local status scripts
|
||||||
|
|
|
@ -41,5 +41,5 @@ register s "^a[g G$>^h" # Goes with ^a~ definition
|
||||||
bind ~ eval 'process s' 'exec sed -i "/./,/^$/!d" /var/run/screen/S-$USER/byobu-exchange' 'echo "See: /var/run/screen/S-$USER/byobu-exchange"' # ctrl-a ~ | write the buffer to file
|
bind ~ eval 'process s' 'exec sed -i "/./,/^$/!d" /var/run/screen/S-$USER/byobu-exchange' 'echo "See: /var/run/screen/S-$USER/byobu-exchange"' # ctrl-a ~ | write the buffer to file
|
||||||
|
|
||||||
# toggle f-key keybindings off
|
# toggle f-key keybindings off
|
||||||
register d "^a:source /usr/share/byobu/keybindings/screen-escape-keys^M"
|
register d "^a:source $BYOBU_PREFIX/share/byobu/keybindings/screen-escape-keys^M"
|
||||||
bind ! eval 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys'
|
bind ! eval 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys'
|
||||||
|
|
|
@ -48,5 +48,5 @@ bind @ screen -t config 0 byobu-config
|
||||||
# ctrl-a-$ Show detailed status
|
# ctrl-a-$ Show detailed status
|
||||||
bind $ screen -t status 0 byobu-status-detail
|
bind $ screen -t status 0 byobu-status-detail
|
||||||
# ctrl-a-! Toggle f-key keybindings on
|
# ctrl-a-! Toggle f-key keybindings on
|
||||||
register e "^a:source /usr/share/byobu/keybindings/f-keys^M"
|
register e "^a:source $BYOBU_PREFIX/share/byobu/keybindings/f-keys^M"
|
||||||
bind ! eval 'process e' 'backtick 111 9999999 9999999 byobu-status menu'
|
bind ! eval 'process e' 'backtick 111 9999999 9999999 byobu-status menu'
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
|
|
||||||
PKG=byobu
|
PKG=byobu
|
||||||
RUNS=100
|
RUNS=100
|
||||||
|
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
|
||||||
|
export BYOBU_PREFIX
|
||||||
|
|
||||||
loop() {
|
loop() {
|
||||||
for j in $(seq 1 $RUNS); do
|
for j in $(seq 1 $RUNS); do
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue