* usr/lib/byobu/include/constants: LP: #1068580

- test for the sed --follow-symlink option and only use it when
    available
This commit is contained in:
Dustin Kirkland 2012-11-01 14:22:41 +01:00
commit ff1f6e64f3
2 changed files with 7 additions and 1 deletions

3
debian/changelog vendored
View file

@ -21,6 +21,9 @@ byobu (5.22) unreleased; urgency=low
- drop timeout on metadata check to 5 seconds - drop timeout on metadata check to 5 seconds
* usr/lib/byobu/release: LP: #1068581 * usr/lib/byobu/release: LP: #1068581
- simplify and use lsb_release -s -r when necessary - simplify and use lsb_release -s -r when necessary
* usr/lib/byobu/include/constants: LP: #1068580
- test for the sed --follow-symlink option and only use it when
available
[ Jake Biesinger and Dustin Kirkland ] [ Jake Biesinger and Dustin Kirkland ]
* usr/share/byobu/keybindings/common, usr/share/byobu/keybindings/f- * usr/share/byobu/keybindings/common, usr/share/byobu/keybindings/f-

View file

@ -94,10 +94,13 @@ case "$BYOBU_BACKEND" in
esac esac
# MacOS Support # MacOS Support
$BYOBU_TEST gsed >/dev/null 2>&1 && export BYOBU_SED="gsed --follow-symlinks" || export BYOBU_SED="sed --follow-symlinks" $BYOBU_TEST gsed >/dev/null 2>&1 && export BYOBU_SED="gsed" || export BYOBU_SED="sed"
$BYOBU_TEST greadlink >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink" $BYOBU_TEST greadlink >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
$BYOBU_TEST sensible-pager >/dev/null 2>&1 && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less" $BYOBU_TEST sensible-pager >/dev/null 2>&1 && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less"
# Check sed's follow-symlinks feature
$BYOBU_SED --follow-symlinks "s///" </dev/null 2>/dev/null && BYOBU_SED="$BYOBU_SED --follow-symlinks" || true
# Default colors # Default colors
export BYOBU_DARK="black" export BYOBU_DARK="black"
export BYOBU_LIGHT="white" export BYOBU_LIGHT="white"