From 25cc120ea59b36e950355f520a389e0919e462b0 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 14 Jan 2013 14:38:44 -0600 Subject: [PATCH] * 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 --- debian/changelog | 3 +++ usr/bin/byobu | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 111786ab..38052194 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ byobu (5.27) unreleased; urgency=low - ensure byobu-config works even if ~/.profile doesn't exist * usr/bin/byobu-ctrl-a: LP: #1098229 - 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 Thu, 10 Jan 2013 16:36:23 -0600 diff --git a/usr/bin/byobu b/usr/bin/byobu index f12ac47a..d200d915 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -38,7 +38,7 @@ if [ -r "$HOME/.byoburc" ]; then fi if [ -z "${BYOBU_PREFIX}" ]; then # 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)))" if [ "$prefix" != "/usr" ]; then echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"