[devtools,2/8] makechrootpkg: usage(): Display the actual default makepkg flags.

Message ID 20170402081002.28176-3-lukeshu@lukeshu.com
State Accepted
Headers show
Series [devtools,1/8] Avoid using string interpolation; use printf format strings instead. | expand

Commit Message

Luke Shumaker April 2, 2017, 8:09 a.m. UTC
From: Luke Shumaker <lukeshu@parabola.nu>

It was displaing the value of the `makepkg_args` variable, which may
have already been changed by the argument parsing by the time it gets
to `-h`.  Now there is a separate `default_makepkg_args` variable.
---
 makechrootpkg.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 5329f76..31d57d3 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -15,7 +15,8 @@  m4_include(lib/archroot.sh)
 
 shopt -s nullglob
 
-makepkg_args=(-s --noconfirm -L --holdver)
+default_makepkg_args=(-s --noconfirm -L --holdver)
+makepkg_args=("${default_makepkg_args[@]}")
 repack=false
 update_first=false
 clean_first=false
@@ -54,7 +55,7 @@  usage() {
 	echo 'from makepkg.conf(5), if those variables are not part of the'
 	echo 'environment.'
 	echo ''
-	echo "Default makepkg args: ${makepkg_args[*]}"
+	echo "Default makepkg args: ${default_makepkg_args[*]}"
 	echo ''
 	echo 'Flags:'
 	echo '-h         This help'