Skip to content

Commit 9bb5fe2

Browse files
author
Matthias Koeppe
committed
m4/sage_spkg_collect.m4 (SAGE_SYSTEM_PACKAGE_NOTICE): Fix quoting
1 parent e249bef commit 9bb5fe2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

m4/sage_spkg_collect.m4

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,12 @@ AC_DEFUN([SAGE_SYSTEM_PACKAGE_NOTICE], [
401401
SYSTEM=$(build/bin/sage-guess-package-system 2>& AS_MESSAGE_FD)
402402
AC_MSG_RESULT([$SYSTEM])
403403
AS_IF([test $SYSTEM != unknown], [
404+
print_sys () {
405+
build/bin/sage-print-system-package-command $SYSTEM --verbose=" " --prompt=" $ " --sudo "$[@]"
406+
}
404407
SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES)
405408
AS_IF([test -n "$SYSTEM_PACKAGES"], [
406-
PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\" \" --prompt=\" \$ \" --sudo"
407-
COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env )
409+
COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env)
408410
AC_MSG_NOTICE([
409411
410412
hint: installing the following system packages, if not
@@ -417,8 +419,7 @@ $COMMAND
417419
])
418420
SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES_OPTIONAL)
419421
AS_IF([test -n "$SYSTEM_PACKAGES"], [
420-
PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\" \" --prompt=\" \$ \" --sudo"
421-
COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env )
422+
COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env)
422423
AC_MSG_NOTICE([
423424
424425
hint: installing the following system packages, if not

0 commit comments

Comments
 (0)