diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-12-05 02:03:39 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-12-05 02:03:39 +0400 |
commit | b095c31c87e86b8e27d9431c1a4bbd2b7dee977f (patch) | |
tree | 44b3a6be8e36bf0d47cffc5aa73fbb1006529a12 /build_files/build_environment | |
parent | 5b9f30980a3661566993841d78fd858c68197454 (diff) |
Can't stress how much I hate bash... This should fix a bug with version comparison (at least under fedora, debian looked OK :/ ).
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 f7023603918..4277edeba3c 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -340,7 +340,7 @@ version_eq() { # $1 and $2 should be version numbers made of numbers only. version_ge() { version_eq $1 $2 - if [ $? -eq 1 -a $(_echo "$1\n$2" | sort --version-sort | head --lines=1) = "$1" ]; then + if [ $? -eq 1 -a $(_echo "$1" "$2" | sort --version-sort | head --lines=1) = "$1" ]; then return 1 else return 0 @@ -1730,7 +1730,7 @@ print_info_ffmpeglink() { _packages="$_packages $OPENJPEG_DEV" fi - # XXX At least under Debian, static schro give problem at blender linking time... :/ + # XXX At least under Debian, static schro gives problem at blender linking time... :/ if $SCHRO_USE && ! $ALL_STATIC; then _packages="$_packages $SCHRO_DEV" fi |