[Bf-blender-cvs] [3cb212602ca] master: install_deps.sh: fix ffmpeg package installation on Arch
Campbell Barton
noreply at git.blender.org
Wed Jan 22 14:53:12 CET 2020
Commit: 3cb212602cacc186800c82febc86f5c68c1f92fb
Author: Campbell Barton
Date: Thu Jan 23 00:50:33 2020 +1100
Branches: master
https://developer.blender.org/rB3cb212602cacc186800c82febc86f5c68c1f92fb
install_deps.sh: fix ffmpeg package installation on Arch
A blank space at the start of the string caused the list to be quoted
as a single argument.
===================================================================
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 64cff825b10..8bb011f1d20 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -993,6 +993,13 @@ download() {
fi
}
+string_trim() {
+ local var="$*"
+ var="${var#"${var%%[![:space:]]*}"}" # Leading.
+ var="${var%"${var##*[![:space:]]}"}" # Trailing.
+ echo -n "$var"
+}
+
# Return 0 if $1 = $2 (i.e. 1.01.0 = 1.1, but 1.1.1 != 1.1), else 1.
# $1 and $2 should be version numbers made of numbers only.
version_eq() {
@@ -4753,6 +4760,8 @@ print_info_ffmpeglink() {
_packages="$_packages $OPENJPEG_DEV"
fi
+ _packages="$(string_trim $_packages)"
+
if [ "$DISTRO" = "DEB" ]; then
print_info_ffmpeglink_DEB
elif [ "$DISTRO" = "RPM" ]; then
More information about the Bf-blender-cvs
mailing list