Navigation Menu

Skip to content

Commit

Permalink
* configure.ac, etc/profile.d/Z97-byobu.sh => etc/profile.d/Z97-
Browse files Browse the repository at this point in the history 
  byobu.sh.in, usr/bin/byobu-config => usr/bin/byobu-config.in,
  usr/bin/byobu-ctrl-a => usr/bin/byobu-ctrl-a.in, usr/bin/byobu-
  disable-prompt => usr/bin/byobu-disable-prompt.in, usr/bin/byobu-
  disable => usr/bin/byobu-disable.in, usr/bin/byobu-enable-prompt =>
  usr/bin/byobu-enable-prompt.in, usr/bin/byobu-enable =>
  usr/bin/byobu-enable.in, usr/bin/byobu-export => usr/bin/byobu-
  export.in, usr/bin/byobu-janitor => usr/bin/byobu-janitor.in,
  usr/bin/byobu-launcher-install => usr/bin/byobu-launcher-install.in,
  usr/bin/byobu-launcher-uninstall => usr/bin/byobu-launcher-
  uninstall.in, usr/bin/byobu-launcher => usr/bin/byobu-launcher.in,
  usr/bin/byobu-launch => usr/bin/byobu-launch.in, usr/bin/byobu-
  layout => usr/bin/byobu-layout.in, usr/bin/byobu-prompt =>
  usr/bin/byobu-prompt.in, usr/bin/byobu-quiet => usr/bin/byobu-
  quiet.in, usr/bin/byobu-reconnect-sockets => usr/bin/byobu-
  reconnect-sockets.in, usr/bin/byobu-select-backend => usr/bin/byobu-
  select-backend.in, usr/bin/byobu-select-profile => usr/bin/byobu-
  select-profile.in, usr/bin/byobu-select-session => usr/bin/byobu-
  select-session.in, usr/bin/byobu-shell => usr/bin/byobu-shell.in,
  usr/bin/byobu-silent => usr/bin/byobu-silent.in, usr/bin/byobu-
  status-detail => usr/bin/byobu-status-detail.in, usr/bin/byobu-
  status => usr/bin/byobu-status.in, usr/bin/byobu-ugraph =>
  usr/bin/byobu-ugraph.in, usr/bin/byobu-ulevel => usr/bin/byobu-
  ulevel.in, usr/bin/byobu => usr/bin/byobu.in,
  usr/lib/byobu/include/config.py =>
  usr/lib/byobu/include/config.py.in, usr/lib/byobu/include/dirs =>
  usr/lib/byobu/include/dirs.in, usr/lib/byobu/include/toggle-utf8 =>
  usr/lib/byobu/include/toggle-utf8.in, usr/share/byobu/tests/byobu-
  time-notifications => usr/share/byobu/tests/byobu-time-
  notifications.in:
  - use @Prefix@ rather than hardcoding /usr, makes code
    more portable and easier to build with ./config --prefix
  • Loading branch information
@dustinkirkland
dustinkirkland committed Feb 28, 2014
1 parent 4435c0c commit e3dadc3
Show file tree
Hide file tree
Showing 33 changed files with 105 additions and 40 deletions.
31 changes: 31 additions & 0 deletions configure.ac
View file
Expand Up @@ -19,7 +19,38 @@ AC_PROG_LN_S
AC_OUTPUT(Makefile \
etc/byobu/Makefile \
etc/profile.d/Makefile \
etc/profile.d/Z97-byobu.sh
usr/share/applications/Makefile \
usr/bin/byobu \
usr/bin/byobu-config \
usr/bin/byobu-ctrl-a \
usr/bin/byobu-disable \
usr/bin/byobu-disable-prompt \
usr/bin/byobu-enable \
usr/bin/byobu-enable-prompt \
usr/bin/byobu-export \
usr/bin/byobu-janitor \
usr/bin/byobu-launch \
usr/bin/byobu-launcher \
usr/bin/byobu-launcher-install \
usr/bin/byobu-launcher-uninstall \
usr/bin/byobu-layout \
usr/bin/byobu-prompt \
usr/bin/byobu-quiet \
usr/bin/byobu-reconnect-sockets \
usr/bin/byobu-select-backend \
usr/bin/byobu-select-profile \
usr/bin/byobu-select-session \
usr/bin/byobu-shell \
usr/bin/byobu-silent \
usr/bin/byobu-status \
usr/bin/byobu-status-detail \
usr/bin/byobu-ugraph \
usr/bin/byobu-ulevel \
usr/lib/byobu/include/config.py \
usr/lib/byobu/include/dirs \
usr/lib/byobu/include/toggle-utf8 \
usr/share/byobu/tests/byobu-time-notifications \
usr/share/byobu/keybindings/Makefile \
usr/share/byobu/pixmaps/Makefile \
usr/share/byobu/profiles/Makefile \
Expand Down
34 changes: 34 additions & 0 deletions debian/changelog
View file
Expand Up @@ -10,6 +10,40 @@ byobu (5.74) unreleased; urgency=low
- add support for yet another batter type (Android)
- thanks to Felix Krull for the initial patch

[ Ryo ONODERA ]
* configure.ac, etc/profile.d/Z97-byobu.sh => etc/profile.d/Z97-
byobu.sh.in, usr/bin/byobu-config => usr/bin/byobu-config.in,
usr/bin/byobu-ctrl-a => usr/bin/byobu-ctrl-a.in, usr/bin/byobu-
disable-prompt => usr/bin/byobu-disable-prompt.in, usr/bin/byobu-
disable => usr/bin/byobu-disable.in, usr/bin/byobu-enable-prompt =>
usr/bin/byobu-enable-prompt.in, usr/bin/byobu-enable =>
usr/bin/byobu-enable.in, usr/bin/byobu-export => usr/bin/byobu-
export.in, usr/bin/byobu-janitor => usr/bin/byobu-janitor.in,
usr/bin/byobu-launcher-install => usr/bin/byobu-launcher-install.in,
usr/bin/byobu-launcher-uninstall => usr/bin/byobu-launcher-
uninstall.in, usr/bin/byobu-launcher => usr/bin/byobu-launcher.in,
usr/bin/byobu-launch => usr/bin/byobu-launch.in, usr/bin/byobu-
layout => usr/bin/byobu-layout.in, usr/bin/byobu-prompt =>
usr/bin/byobu-prompt.in, usr/bin/byobu-quiet => usr/bin/byobu-
quiet.in, usr/bin/byobu-reconnect-sockets => usr/bin/byobu-
reconnect-sockets.in, usr/bin/byobu-select-backend => usr/bin/byobu-
select-backend.in, usr/bin/byobu-select-profile => usr/bin/byobu-
select-profile.in, usr/bin/byobu-select-session => usr/bin/byobu-
select-session.in, usr/bin/byobu-shell => usr/bin/byobu-shell.in,
usr/bin/byobu-silent => usr/bin/byobu-silent.in, usr/bin/byobu-
status-detail => usr/bin/byobu-status-detail.in, usr/bin/byobu-
status => usr/bin/byobu-status.in, usr/bin/byobu-ugraph =>
usr/bin/byobu-ugraph.in, usr/bin/byobu-ulevel => usr/bin/byobu-
ulevel.in, usr/bin/byobu => usr/bin/byobu.in,
usr/lib/byobu/include/config.py =>
usr/lib/byobu/include/config.py.in, usr/lib/byobu/include/dirs =>
usr/lib/byobu/include/dirs.in, usr/lib/byobu/include/toggle-utf8 =>
usr/lib/byobu/include/toggle-utf8.in, usr/share/byobu/tests/byobu-
time-notifications => usr/share/byobu/tests/byobu-time-
notifications.in:
- use @prefix@ rather than hardcoding /usr, makes code
more portable and easier to build with ./config --prefix

[ Arminius Silvanus ]
* usr/share/byobu/profiles/bashrc: LP: #1280550
- test the $BASH variable, rather than $SHELL, to tell if we're
Expand Down
16 changes: 8 additions & 8 deletions etc/profile.d/Z97-byobu.sh → etc/profile.d/Z97-byobu.sh.in
View file
Expand Up @@ -20,16 +20,16 @@
# Apologies for borrowing the LC_BYOBU namespace, but:
# a) it's reasonable to assume that no one else is using LC_BYOBU
# b) LC_* is sent and receieved by most /etc/ssh/ssh*_config
if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "/usr/bin/byobu-launch" ]; then
. /usr/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "/usr/bin/byobu-launch" ]; then
. /usr/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "/usr/bin/byobu-launch" ]; then
if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "@prefix@/bin/byobu-launch" ]; then
. @prefix@/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
. @prefix@/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
export BYOBU_BACKEND="screen"
. /usr/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "/usr/bin/byobu-launch" ]; then
. @prefix@/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
export BYOBU_BACKEND="tmux"
. /usr/bin/byobu-launch
. @prefix@/bin/byobu-launch
fi

# vi: syntax=sh ts=4 noexpandtab
2 changes: 1 addition & 1 deletion usr/bin/byobu-config → usr/bin/byobu-config.in
View file
Expand Up @@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

PKG="byobu"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py"
2 changes: 1 addition & 1 deletion usr/bin/byobu-ctrl-a → usr/bin/byobu-ctrl-a.in
View file
Expand Up @@ -27,7 +27,7 @@ EOF

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

bind_to=""
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-disable-prompt → usr/bin/byobu-disable-prompt.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

$BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc"
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-disable → usr/bin/byobu-disable.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

byobu-launcher-uninstall
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-enable-prompt → usr/bin/byobu-enable-prompt.in
View file
Expand Up @@ -21,7 +21,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"


Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-enable → usr/bin/byobu-enable.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

byobu-launcher-install
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-export → usr/bin/byobu-export.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

gettext "
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-janitor → usr/bin/byobu-janitor.in
View file
Expand Up @@ -21,7 +21,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

# Ensure that all updates get run immediately
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-launch → usr/bin/byobu-launch.in
View file
Expand Up @@ -43,7 +43,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
BYOBU_SOURCED_PROFILE=1
PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
# Ensure that autolaunch is not explicitly disabled
if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-launcher-install → usr/bin/byobu-launcher-install.in
View file
Expand Up @@ -20,7 +20,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach"
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-launcher-uninstall → usr/bin/byobu-launcher-uninstall.in
View file
Expand Up @@ -20,7 +20,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

remove_launcher() {
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-launcher → usr/bin/byobu-launcher.in
View file
Expand Up @@ -22,7 +22,7 @@ PKG="byobu"
# ie, rather than "sudo byobu", you must run "sudo -H byobu"
if [ -O "$HOME" ]; then
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
false
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-layout → usr/bin/byobu-layout.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

# Get the layouts directory
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-prompt → usr/bin/byobu-prompt.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

echo
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-quiet → usr/bin/byobu-quiet.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

FLAG="$BYOBU_CONFIG_DIR/status.disable"
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-reconnect-sockets → usr/bin/byobu-reconnect-sockets.in
View file
Expand Up @@ -25,7 +25,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

case "$-" in
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-select-backend → usr/bin/byobu-select-backend.in
View file
Expand Up @@ -20,7 +20,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

usage () {
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-select-profile → usr/bin/byobu-select-profile.in
View file
Expand Up @@ -24,7 +24,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

TEXTDOMAIN="$PKG"
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-select-session → usr/bin/byobu-select-session.in
View file
Expand Up @@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

PKG="byobu"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/select-session.py"
2 changes: 1 addition & 1 deletion usr/bin/byobu-shell → usr/bin/byobu-shell.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed"
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-silent → usr/bin/byobu-silent.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

FLAG="$BYOBU_CONFIG_DIR/status.disable"
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-status-detail → usr/bin/byobu-status-detail.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

if which vim >/dev/null && `vim --version | grep -q +folding`; then
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-status → usr/bin/byobu-status.in
View file
Expand Up @@ -20,7 +20,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

# Make sure status is not disabled
Expand Down
4 changes: 2 additions & 2 deletions usr/bin/byobu-ugraph → usr/bin/byobu-ugraph.in
View file
Expand Up @@ -26,7 +26,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

script_name=${0##*/}
Expand Down Expand Up @@ -81,7 +81,7 @@ Examples:
Trailing echo adds a required newline
Note no filename specified.
$script_name "(/usr/lib/byobu/mem_used | sed -e 's/% //g';echo)"
$script_name "(@prefix@/lib/byobu/mem_used | sed -e 's/% //g';echo)"
Using $script_name just to rotate log and display the graph
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/byobu-ulevel → usr/bin/byobu-ulevel.in
View file
Expand Up @@ -37,7 +37,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

circles_2=(○ ●)
Expand Down
4 changes: 2 additions & 2 deletions usr/bin/byobu → usr/bin/byobu.in
View file
Expand Up @@ -41,14 +41,14 @@ if [ -z "${BYOBU_PREFIX}" ]; then
# Find and export the installation location prefix
greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))"
if [ "$prefix" != "/usr" ]; then
if [ "$prefix" != "@prefix@" ]; then
echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"
. "$HOME/.byoburc"
fi
fi
export BYOBU_CHARMAP=$(locale charmap)
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"

# Override backend if we can determine intentions from argv[0]
Expand Down
2 changes: 1 addition & 1 deletion usr/lib/byobu/include/config.py → usr/lib/byobu/include/config.py.in
View file
Expand Up @@ -52,7 +52,7 @@ def error(msg):
BYOBU_RUN_DIR = os.getenv("BYOBU_RUN_DIR", HOME + "/.cache/byobu")
BYOBU_BACKEND = os.getenv("BYOBU_BACKEND", "tmux")
BYOBU_SOCKETDIR = os.getenv("SOCKETDIR", "/var/run/screen")
BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "/usr")
BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "@prefix@")
SHARE = BYOBU_PREFIX + '/share/' + PKG
DOC = BYOBU_PREFIX + '/share/doc/' + PKG
if not os.path.exists(SHARE):
Expand Down
2 changes: 1 addition & 1 deletion usr/lib/byobu/include/dirs → usr/lib/byobu/include/dirs.in
View file
Expand Up @@ -22,7 +22,7 @@ PKG="byobu"

# Some users build and install byobu themselves, rather than from a distro
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr"
[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="@prefix@"

# Create and export the user configuration directory
if [ -d "$BYOBU_CONFIG_DIR" ]; then
Expand Down
2 changes: 1 addition & 1 deletion usr/lib/byobu/include/toggle-utf8 → usr/lib/byobu/include/toggle-utf8.in
View file
Expand Up @@ -19,7 +19,7 @@

PKG="byobu"
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc"

Expand Down
2 changes: 1 addition & 1 deletion ...hare/byobu/tests/byobu-time-notifications → ...e/byobu/tests/byobu-time-notifications.in
View file
Expand Up @@ -21,7 +21,7 @@

PKG=byobu
RUNS=100
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="@prefix@"
export BYOBU_PREFIX

loop() {
Expand Down

0 comments on commit e3dadc3

Please sign in to comment.