From 2060f72f22bba36d125ce520ecbf8c6c7b3542e7 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 2 Nov 2010 13:37:34 +0000 Subject: [PATCH] (trunk third-party) #3707 "remove dependency to which" -- committed. fix by geirha. --- third-party/miniupnp/updateminiupnpcstrings.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/third-party/miniupnp/updateminiupnpcstrings.sh b/third-party/miniupnp/updateminiupnpcstrings.sh index 050c2fa40..a79818457 100755 --- a/third-party/miniupnp/updateminiupnpcstrings.sh +++ b/third-party/miniupnp/updateminiupnpcstrings.sh @@ -12,18 +12,9 @@ if [ -f /etc/debian_version ]; then OS_VERSION=`cat /etc/debian_version` fi # use lsb_release (Linux Standard Base) when available -LSB_RELEASE=`which lsb_release` -if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then - OS_NAME=`${LSB_RELEASE} -i -s` - OS_VERSION=`${LSB_RELEASE} -r -s` - case $OS_NAME in - Debian) - #OS_VERSION=`${LSB_RELEASE} -c -s` - ;; - Ubuntu) - #OS_VERSION=`${LSB_RELEASE} -c -s` - ;; - esac +if os_name=`lsb_release -i -s 2>/dev/null`; then + OS_NAME=$os_name + OS_VERSION=`lsb_release -r -s` fi echo "Detected OS [$OS_NAME] version [$OS_VERSION]"