diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-18 17:06:37 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-18 17:07:52 +0400 |
| commit | d24d2f23e43046a59c6bf52a4f2ca977ea91af20 (patch) | |
| tree | 71d28a8193f3c5a790cfc9e427c9fb4ac7e90c22 /build_files/build_environment | |
| parent | a6ae12aa6267ed95cea92f4722a7545cdc4f34bd (diff) | |
Install_deps: Better handling of 'check installed' in Debian, and fix jack2d check.
Patch D742, by oweissbarth (Oliver Weissbarth), thanks!
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |