Revert "install_deps.sh: fix ffmpeg package installation on Arch"
This reverts commit 3cb212602c.
The root cause was IFS being set incorrectly.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user