[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52220] trunk/blender/build_files/ build_environment/install_deps.sh: Grmpff! Some stupids edits sneaked in previous commit!

[Bastien Montagne]

Revision: 52220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52220
Author:   mont29
Date:     2012-11-14 23:28:29 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Grmpff! Some stupids edits sneaked in previous commit!

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-14 23:20:16 UTC (rev 52219)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-14 23:28:29 UTC (rev 52220)
@@ -36,6 +36,7 @@
 }
 
 # Return 1 if $1 >= $2, else 0.
+# $1 and $2 should be version numbers made of numbers only.
 version_ge() {
   if [ $(echo -e "$1\n$2" | sort --version-sort | head --lines=1) = "$1" ]; then
     return 0
@@ -45,10 +46,11 @@
 }
 
 # Return 1 if $1 is into $2 (e.g. 3.3.2 is into 3.3, but not 3.3.0 or 3.3.5)
-# $1 must be at least as long as $2!
+# $1 and $2 should be version numbers made of numbers only.
+# $1 should be at least as long as $2!
 version_match() {
   backIFS=$IFS
-	IFS='.'
+  IFS='.'
 
   # Split both version numbers into their numeric elements.
   arr1=( $1 )
@@ -69,7 +71,7 @@
     done
   fi
 
-	IFS=$backIFS
+  IFS=$backIFS
   return $ret
 }
 
@@ -336,6 +338,7 @@
   INFO "Installing dependencies for DEB-based distributive"
 
   sudo apt-get update
+# XXX Why in hell? Let's let this stuff to the user's responsability!!!
 #  sudo apt-get -y upgrade
 
   sudo apt-get install -y cmake scons gcc g++ libjpeg-dev libpng-dev libtiff-dev \
@@ -377,7 +380,7 @@
   if [ $? -eq 0 ]; then
     sudo apt-get install -y libvpx-dev
     vpx_version=`deb_version libvpx-dev`
-    if [ ! -z "$vpx_version" ]; then
+    if  dpkg --compare-versions $vpx_version gt 0.9.7; then
       if version_ge $vpx_version 0.9.7; then
         HASVPX=true
       fi
@@ -509,7 +512,7 @@
     HASMP3LAME=true
   fi
 
-  check_package_version_match_RPM python-devel 3.3
+  check_package_version_match_RPM python3-devel 3.3
   if [ $? -eq 1 ]; then
     sudo yum install -y python-devel
   else