From ed4a118ca3cd9d7b583bc8f103ca60f70c9f9a0f Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Tue, 19 Jul 2011 10:39:28 -0500
Subject: [PATCH] * usr/bin/byobu-janitor, usr/bin/byobu-launcher-uninstall,  
 usr/lib/byobu/.constants, usr/lib/byobu/disk_io:   - move the MacOSX support
 to constants

---
 debian/changelog                 | 3 +++
 usr/bin/byobu-janitor            | 3 ---
 usr/bin/byobu-launcher-uninstall | 3 ---
 usr/lib/byobu/.constants         | 4 ++++
 usr/lib/byobu/disk_io            | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b584f229..c9f1aedb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,9 @@ byobu (4.18) unreleased; urgency=low
     usr/share/byobu/profiles/screenrc:
     - move byobu-statusd to the rc profiles, as we don't want to run again
       on profile reload
+  * usr/bin/byobu-janitor, usr/bin/byobu-launcher-uninstall,
+    usr/lib/byobu/.constants, usr/lib/byobu/disk_io:
+    - move the MacOSX support to constants
 
   [ James Spencer ]
   * usr/lib/byobu/.constants:
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index e09b1a5e..464a3052 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -33,9 +33,6 @@ fi
 # Set the rest of the variables
 DEFAULT_PROFILE="light"
 PROFILE="$BYOBU_CONFIG_DIR/profile"
-# Use gsed on non-Linux OS's
-command -v gsed >/dev/null && SED="gsed" || SED="sed"
-command -v greadlink >/dev/null && READLINK="greadlink" || READLINK="readlink"
 
 # Create byobu-exchange buffer file, with secure permissions, if it doesn't exist
 [ -e "$BYOBU_RUN_DIR/printscreen" ] || install -m 600 /dev/null "$BYOBU_RUN_DIR/printscreen"
diff --git a/usr/bin/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall
index 9cdb7732..0b34b33a 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall
@@ -22,9 +22,6 @@ PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/.common"
 
-# Use gsed on non-Linux OS's
-which gsed 2>/dev/null && SED="gsed" || SED="sed"
-
 remove_launcher() {
 	dest=$1
 	if [ -w "$dest" ]; then
diff --git a/usr/lib/byobu/.constants b/usr/lib/byobu/.constants
index 92bcf820..6e318494 100755
--- a/usr/lib/byobu/.constants
+++ b/usr/lib/byobu/.constants
@@ -58,3 +58,7 @@ case "$BYOBU_BACKEND" in
 		BYOBU_ARG_VERSION="-v"
 	;;
 esac
+
+# MacOS Support
+command -v gsed >/dev/null && SED="gsed" || SED="sed"
+command -v greadlink >/dev/null && READLINK="greadlink" || READLINK="readlink"
diff --git a/usr/lib/byobu/disk_io b/usr/lib/byobu/disk_io
index 227ae262..84addacf 100755
--- a/usr/lib/byobu/disk_io
+++ b/usr/lib/byobu/disk_io
@@ -31,7 +31,6 @@ __disk_io_detail() {
 getdisk() {
 	local t=""
 	if [ -L "${1}" ]; then
-		command -v greadlink >/dev/null && READLINK=greadlink || READLINK=readlink
 		t=$($READLINK -f "$1")
 	else
 		t="$1"