* usr/bin/byobu: LP: #1026595

- fix readlink detection; we were using BYOBU_TEST before it was defined
  - instead, try to greadlink -f .; operationally the same
This commit is contained in:
Dustin Kirkland 2013-01-14 14:38:44 -06:00
commit 25cc120ea5
2 changed files with 4 additions and 1 deletions

3
debian/changelog vendored
View file

@ -4,6 +4,9 @@ byobu (5.27) unreleased; urgency=low
- ensure byobu-config works even if ~/.profile doesn't exist - ensure byobu-config works even if ~/.profile doesn't exist
* usr/bin/byobu-ctrl-a: LP: #1098229 * usr/bin/byobu-ctrl-a: LP: #1098229
- fix typo that breaks ctrl-a selection behavior - fix typo that breaks ctrl-a selection behavior
* usr/bin/byobu: LP: #1026595
- fix readlink detection; we were using BYOBU_TEST before it was defined
- instead, try to greadlink -f .; operationally the same
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 10 Jan 2013 16:36:23 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 10 Jan 2013 16:36:23 -0600

View file

@ -38,7 +38,7 @@ if [ -r "$HOME/.byoburc" ]; then
fi fi
if [ -z "${BYOBU_PREFIX}" ]; then if [ -z "${BYOBU_PREFIX}" ]; then
# Find and export the installation location prefix # Find and export the installation location prefix
$BYOBU_TEST greadlink >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink" greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))" prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))"
if [ "$prefix" != "/usr" ]; then if [ "$prefix" != "/usr" ]; then
echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc" echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"