tox.ini (local-root, local-sudo): Run output of sage-print-system-package-command through eval

Matthias Koeppe · Matthias Koeppe · commit 3c7e5c482e1c · 2020-12-06T13:48:47.000-08:00
diff --git a/tox.ini b/tox.ini
@@ -407,8 +407,8 @@ commands =
     # local-root:  Assume we are root, run the system package commands
     # local-sudo:  Use sudo to run the system package commands as root
     #
-    local-{root,sudo}:    bash -c '$(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} update) #'
-    local-{root,sudo}:    bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} --yes --no-install-recommends install $PACKAGES) || [ "$IGNORE_MISSING_SYSTEM_PACKAGES" = yes ] && echo "(ignoring errors)" '
+    local-{root,sudo}:    bash -c 'eval $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} update) #'
+    local-{root,sudo}:    bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); eval $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} --yes --no-install-recommends install $PACKAGES) || [ "$IGNORE_MISSING_SYSTEM_PACKAGES" = yes ] && echo "(ignoring errors)" '
     #
     # All "local" environments
     #

Original file line number	Diff line number	Diff line change
`@@ -407,8 +407,8 @@ commands =`
`407`	`407`	`# local-root: Assume we are root, run the system package commands`
`408`	`408`	`# local-sudo: Use sudo to run the system package commands as root`
`409`	`409`	`#`
`410`		`- local-{root,sudo}: bash -c '$(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} update) #'`
`411`		`- local-{root,sudo}: bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} --yes --no-install-recommends install $PACKAGES) \|\| [ "$IGNORE_MISSING_SYSTEM_PACKAGES" = yes ] && echo "(ignoring errors)" '`
	`410`	`+ local-{root,sudo}: bash -c 'eval $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} update) #'`
	`411`	`+ local-{root,sudo}: bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); eval $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} --yes --no-install-recommends install $PACKAGES) \|\| [ "$IGNORE_MISSING_SYSTEM_PACKAGES" = yes ] && echo "(ignoring errors)" '`
`412`	`412`	`#`
`413`	`413`	`# All "local" environments`
`414`	`414`	`#`