diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2020-12-06 18:16:59 +0000 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2020-12-06 22:11:11 +0000 |
| commit | 09422f9a28481eb5c49d375a6b5b7ca2b773c1ae (patch) | |
| tree | d615cf5a0d0249ee4dfad1f1d18a52e55966c52a /units/meson-add-wants.sh | |
| parent | 5e577e1737a4fd603067536b3b21d32f7d180fee (diff) | |
| download | systemd-09422f9a28481eb5c49d375a6b5b7ca2b773c1ae.tar.gz | |
meson: Respect MESON_INSTALL_QUIET
MESON_INSTALL_QUIET is set when --quiet is passed to meson install.
Make sure we check the variable in our custom install scripts and
don't output anything if it is set.
Diffstat (limited to 'units/meson-add-wants.sh')
| -rwxr-xr-x | units/meson-add-wants.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh index a483d75b86..2241fc26a2 100755 --- a/units/meson-add-wants.sh +++ b/units/meson-add-wants.sh @@ -5,6 +5,12 @@ unitdir="$1" target="$2" unit="$3" +if [ "${MESON_INSTALL_QUIET:-0}" = 1 ] ; then + VERBOSE="" +else + VERBOSE="v" +fi + case "$target" in */?*) # a path, but not just a slash at the end dir="${DESTDIR:-}${target}" @@ -18,11 +24,11 @@ unitpath="${DESTDIR:-}${unitdir}/${unit}" case "$target" in */) - mkdir -vp -m 0755 "$dir" + mkdir -${VERBOSE}p -m 0755 "$dir" ;; *) - mkdir -vp -m 0755 "$(dirname "$dir")" + mkdir -${VERBOSE}p -m 0755 "$(dirname "$dir")" ;; esac -ln -vfs --relative "$unitpath" "$dir" +ln -${VERBOSE}fs --relative "$unitpath" "$dir" |