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.

diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
index cdd5214125fb6374f8e8e817a0da68c0d583781b..8c7e887f5121c7176988d7f5fe98f64e5da75cb2 100755 (executable)
--- a/tools/meson-make-symlink.sh
+++ b/tools/meson-make-symlink.sh
@@ -1,12 +1,18 @@
 #!/bin/sh
 set -eu
 
+if [ "${MESON_INSTALL_QUIET:-0}" = 1 ] ; then
+    VERBOSE=""
+else
+    VERBOSE="v"
+fi
+
 # this is needed mostly because $DESTDIR is provided as a variable,
 # and we need to create the target directory...
 
-mkdir -vp "$(dirname "${DESTDIR:-}$2")"
+mkdir -${VERBOSE}p "$(dirname "${DESTDIR:-}$2")"
 if [ "$(dirname $1)" = . -o "$(dirname $1)" = .. ]; then
-    ln -vfs -T -- "$1" "${DESTDIR:-}$2"
+    ln -${VERBOSE}fs -T -- "$1" "${DESTDIR:-}$2"
 else
-    ln -vfs -T --relative -- "${DESTDIR:-}$1" "${DESTDIR:-}$2"
+    ln -${VERBOSE}fs -T --relative -- "${DESTDIR:-}$1" "${DESTDIR:-}$2"
 fi

diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
index a483d75b86f36d0b81223cae62fa12043c64d015..2241fc26a284659dc72ada499e1d3aa0236d6e31 100755 (executable)
--- 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"