From e215949baefc94139b05bc8fc2b775103bf4566b Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 14 Apr 2011 17:58:24 -0500 Subject: [PATCH] usr/bin/byobu-janitor: use greadlink on Mac OSX, LP: #740370 --- debian/changelog | 1 + usr/bin/byobu-janitor | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f3e27c7a..38bb8a17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ byobu (3.30) unreleased; urgency=low usr/share/byobu/profiles/screenrc: support using ~/.byoburc, instead of ~/.screenrc, if present; some users seem to want to use byobu and screen separately, and keep their profiles separate, LP: #731529 + * usr/bin/byobu-janitor: use greadlink on Mac OSX, LP: #740370 [ Chaskiel Grundman ] * debian/postinst: correctly fix old-school screen-profiles era diversions diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor index ff837d4e..f237bea5 100755 --- a/usr/bin/byobu-janitor +++ b/usr/bin/byobu-janitor @@ -45,6 +45,7 @@ DEFAULT_PROFILE="light" PROFILE="$DATA/profile" # Use gsed on non-Linux OS's which gsed 2>/dev/null && SED="gsed" || SED="sed" +which greadlink 2>/dev/null && READLINK="greadlink" || READLINK="readlink" # Create byobu-exchange buffer file, with secure permissions, if it doesn't exist if [ -w "$RUN" ] && [ ! -e "$RUN/$PKG-exchange" ]; then @@ -65,7 +66,7 @@ fi # Affects: Symlinks pointing to color profiles if [ -h "$PROFILE" ]; then - case "$(readlink -f $PROFILE)" in + case "$($READLINK -f $PROFILE)" in $BYOBU_PREFIX/share/byobu/profiles/*) # Set default colors BG=W