diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2021-11-25 18:27:29 +0200 |
|---|---|---|
| committer | avih <avih@users.noreply.github.com> | 2021-12-01 11:00:05 +0200 |
| commit | 1eb1bd29d183ceb4863cc84a2fbc4bc2c3d0195d (patch) | |
| tree | d71158547b41595d71f0f551cdaff9755048741c | |
| parent | ea05a4e2b4d17729ce614a5f5a1d71280c7dce22 (diff) | |
| download | mpv-build-1eb1bd29d183ceb4863cc84a2fbc4bc2c3d0195d.tar.bz2 mpv-build-1eb1bd29d183ceb4863cc84a2fbc4bc2c3d0195d.tar.xz | |
build options: allow CLI arguments with spaces
This affects CLI arguments to ./build, ./rebuild, as well as when
invoking any of scripts/*-build directly.
Previously, if such CLI argument contained a space, then the argument
was incorrectly split. Now spaces are taken correctly.
The issue was that the scripts used unquoted $@, which is identical to
unquoted $*, i.e. it's field-split on IFS.
Now we use quoted "$@", which preserves the arguments exactly.
Also, previously scripts/fribidi-build ignored the CLI arguments, and
now it doesn't (but we still override any -jN option with -j1).
| -rwxr-xr-x | build | 8 | ||||
| -rwxr-xr-x | rebuild | 2 | ||||
| -rwxr-xr-x | scripts/ffmpeg-build | 2 | ||||
| -rwxr-xr-x | scripts/fribidi-build | 2 | ||||
| -rwxr-xr-x | scripts/libass-build | 2 | ||||
| -rwxr-xr-x | scripts/mpv-build | 2 |
6 files changed, 9 insertions, 9 deletions
@@ -3,10 +3,10 @@ set -e export LC_ALL=C #scripts/fribidi-config -#scripts/fribidi-build $@ +#scripts/fribidi-build "$@" scripts/libass-config -scripts/libass-build $@ +scripts/libass-build "$@" scripts/ffmpeg-config -scripts/ffmpeg-build $@ +scripts/ffmpeg-build "$@" scripts/mpv-config -scripts/mpv-build $@ +scripts/mpv-build "$@" @@ -4,4 +4,4 @@ export LC_ALL=C ./update ./clean -./build $@ +./build "$@" diff --git a/scripts/ffmpeg-build b/scripts/ffmpeg-build index 575282c..7ef3a36 100755 --- a/scripts/ffmpeg-build +++ b/scripts/ffmpeg-build @@ -1,4 +1,4 @@ #!/bin/sh set -e -make -C ffmpeg_build install $@ +make -C ffmpeg_build install "$@" diff --git a/scripts/fribidi-build b/scripts/fribidi-build index 1fe4151..b75558a 100755 --- a/scripts/fribidi-build +++ b/scripts/fribidi-build @@ -1,4 +1,4 @@ #!/bin/sh set -e -make -C fribidi install -j1 # race conditions in the make rules +make -C fribidi install "$@" -j1 # race conditions in the make rules diff --git a/scripts/libass-build b/scripts/libass-build index b7c2048..6fcce6c 100755 --- a/scripts/libass-build +++ b/scripts/libass-build @@ -1,4 +1,4 @@ #!/bin/sh set -e -make -C libass install $@ +make -C libass install "$@" diff --git a/scripts/mpv-build b/scripts/mpv-build index 8b36c49..0a73ba8 100755 --- a/scripts/mpv-build +++ b/scripts/mpv-build @@ -2,4 +2,4 @@ set -e cd mpv -python3 ./waf build $@ +python3 ./waf build "$@" |