From 9bb5fe2eada89aa935ffce68967d8e69231c44fb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 6 Jan 2024 18:57:14 -0800 Subject: [PATCH] m4/sage_spkg_collect.m4 (SAGE_SYSTEM_PACKAGE_NOTICE): Fix quoting --- m4/sage_spkg_collect.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/m4/sage_spkg_collect.m4 b/m4/sage_spkg_collect.m4 index 0ceb34a76eb..27cac574a77 100644 --- a/m4/sage_spkg_collect.m4 +++ b/m4/sage_spkg_collect.m4 @@ -401,10 +401,12 @@ AC_DEFUN([SAGE_SYSTEM_PACKAGE_NOTICE], [ SYSTEM=$(build/bin/sage-guess-package-system 2>& AS_MESSAGE_FD) AC_MSG_RESULT([$SYSTEM]) AS_IF([test $SYSTEM != unknown], [ + print_sys () { + build/bin/sage-print-system-package-command $SYSTEM --verbose=" " --prompt=" $ " --sudo "$[@]" + } SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES) AS_IF([test -n "$SYSTEM_PACKAGES"], [ - PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\" \" --prompt=\" \$ \" --sudo" - COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env ) + COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env) AC_MSG_NOTICE([ hint: installing the following system packages, if not @@ -417,8 +419,7 @@ $COMMAND ]) SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES_OPTIONAL) AS_IF([test -n "$SYSTEM_PACKAGES"], [ - PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\" \" --prompt=\" \$ \" --sudo" - COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env ) + COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env) AC_MSG_NOTICE([ hint: installing the following system packages, if not