* usr/bin/byobu-janitor, usr/bin/byobu-launcher-uninstall,

usr/lib/byobu/.constants, usr/lib/byobu/disk_io:
  - move the MacOSX support to constants
This commit is contained in:
Dustin Kirkland 2011-07-19 10:39:28 -05:00
commit ed4a118ca3
5 changed files with 7 additions and 7 deletions

3
debian/changelog vendored
View file

@ -85,6 +85,9 @@ byobu (4.18) unreleased; urgency=low
usr/share/byobu/profiles/screenrc: usr/share/byobu/profiles/screenrc:
- move byobu-statusd to the rc profiles, as we don't want to run again - move byobu-statusd to the rc profiles, as we don't want to run again
on profile reload 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 ] [ James Spencer ]
* usr/lib/byobu/.constants: * usr/lib/byobu/.constants:

View file

@ -33,9 +33,6 @@ fi
# Set the rest of the variables # Set the rest of the variables
DEFAULT_PROFILE="light" DEFAULT_PROFILE="light"
PROFILE="$BYOBU_CONFIG_DIR/profile" 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 # 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" [ -e "$BYOBU_RUN_DIR/printscreen" ] || install -m 600 /dev/null "$BYOBU_RUN_DIR/printscreen"

View file

@ -22,9 +22,6 @@ PKG="byobu"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/.common" . "${BYOBU_PREFIX}/lib/${PKG}/.common"
# Use gsed on non-Linux OS's
which gsed 2>/dev/null && SED="gsed" || SED="sed"
remove_launcher() { remove_launcher() {
dest=$1 dest=$1
if [ -w "$dest" ]; then if [ -w "$dest" ]; then

View file

@ -58,3 +58,7 @@ case "$BYOBU_BACKEND" in
BYOBU_ARG_VERSION="-v" BYOBU_ARG_VERSION="-v"
;; ;;
esac esac
# MacOS Support
command -v gsed >/dev/null && SED="gsed" || SED="sed"
command -v greadlink >/dev/null && READLINK="greadlink" || READLINK="readlink"

View file

@ -31,7 +31,6 @@ __disk_io_detail() {
getdisk() { getdisk() {
local t="" local t=""
if [ -L "${1}" ]; then if [ -L "${1}" ]; then
command -v greadlink >/dev/null && READLINK=greadlink || READLINK=readlink
t=$($READLINK -f "$1") t=$($READLINK -f "$1")
else else
t="$1" t="$1"