From e7da7030cf751b61bc8c263fea6ca37b59b6af44 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 14 Jan 2013 15:24:22 -0600 Subject: [PATCH] * usr/lib/byobu/distro, usr/lib/byobu/release: LP: #1004722 - use sw_vers utility on Mac to determine distro and release --- debian/changelog | 2 ++ usr/lib/byobu/distro | 2 ++ usr/lib/byobu/release | 2 ++ 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 877f24f3..fd35e991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ byobu (5.27) unreleased; urgency=low bzr * usr/bin/byobu-select-profile: LP: #946112 - fix byobu interactive color selection in tmux + * usr/lib/byobu/distro, usr/lib/byobu/release: LP: #1004722 + - use sw_vers utility on Mac to determine distro and release -- Dustin Kirkland Thu, 10 Jan 2013 16:36:23 -0600 diff --git a/usr/lib/byobu/distro b/usr/lib/byobu/distro index 6a09639d..35319940 100755 --- a/usr/lib/byobu/distro +++ b/usr/lib/byobu/distro @@ -58,6 +58,8 @@ __distro() { DISTRO=$(lsb_release -s -i) ;; esac + elif $BYOBU_TEST sw_vers >/dev/null 2>&1; then + DISTRO="$(sw_vers -productName)" elif $BYOBU_TEST uname >/dev/null 2>&1; then DISTRO="$(uname -s)" else diff --git a/usr/lib/byobu/release b/usr/lib/byobu/release index 70a8de87..15072485 100755 --- a/usr/lib/byobu/release +++ b/usr/lib/byobu/release @@ -43,6 +43,8 @@ __release() { RELEASE="$ver" ;; esac + elif $BYOBU_TEST sw_vers >/dev/null 2>&1; then + RELEASE="$(sw_vers -productVersion)" fi if [ -z "$RELEASE" ] && $BYOBU_TEST lsb_release >/dev/null 2>&1; then # If lsb_release is available, use it