From d24d2f23e43046a59c6bf52a4f2ca977ea91af20 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Mon, 18 Aug 2014 15:06:37 +0200
Subject: Install_deps: Better handling of 'check installed' in Debian, and fix
 jack2d check.

Patch D742, by oweissbarth (Oliver Weissbarth), thanks!
---
 build_files/build_environment/install_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build_files/build_environment')

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 7b6076cea73..c1b2fd96c97 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1694,7 +1694,7 @@ check_package_DEB() {
 }
 
 check_package_installed_DEB() {
-  r=`dpkg -s $1 | grep -c '$1'`
+  r=`dpkg-query -W -f='${Status}' $1 | grep -c "install ok"`
 
   if [ $r -ge 1 ]; then
     return 0
@@ -1854,7 +1854,7 @@ install_DEB() {
     # Only install jack if jack2 is not already installed!
     JACK="libjack-dev"
     JACK2="libjack-jackd2-dev"
-    check_package_installed_DEB JACK2
+    check_package_installed_DEB $JACK2
     if [ $? -eq 0 ]; then
       _packages="$_packages $JACK2"
     else
-- 
cgit v1.2.3