diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-22 17:28:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-22 17:42:33 +0300 |
| commit | fc0df1ffb4d37f3b86a3bf890e383a5b11c266a8 (patch) | |
| tree | 5342f432c2a53671bbfdcc0427a6f094f88394f1 /build_files | |
| parent | cfb7a8048c5d9a5b7c1e15a2681ded342d34f253 (diff) | |
Revert "install_deps.sh: fix ffmpeg package installation on Arch"
This reverts commit 3cb212602cacc186800c82febc86f5c68c1f92fb.
The root cause was IFS being set incorrectly.
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 8bb011f1d20..64cff825b10 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -993,13 +993,6 @@ 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() { @@ -4760,8 +4753,6 @@ print_info_ffmpeglink() { _packages="$_packages $OPENJPEG_DEV" fi - _packages="$(string_trim $_packages)" - if [ "$DISTRO" = "DEB" ]; then print_info_ffmpeglink_DEB elif [ "$DISTRO" = "RPM" ]; then |