[Bf-blender-cvs] [d24d2f2] master: Install_deps: Better handling of 'check installed' in Debian, and fix jack2d check.
Bastien Montagne
noreply at git.blender.org
Mon Aug 18 15:10:54 CEST 2014
Commit: d24d2f23e43046a59c6bf52a4f2ca977ea91af20
Author: Bastien Montagne
Date: Mon Aug 18 15:06:37 2014 +0200
Branches: master
https://developer.blender.org/rBd24d2f23e43046a59c6bf52a4f2ca977ea91af20
Install_deps: Better handling of 'check installed' in Debian, and fix jack2d check.
Patch D742, by oweissbarth (Oliver Weissbarth), thanks!
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 7b6076c..c1b2fd9 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
More information about the Bf-blender-cvs
mailing list