Bugfix: make sure that any fpm_args defined in fpm-info.sh get

introduced at the correct position in the fpm argument list. This only
affects non-Python packages (we already did the right thing for Python
packages).

refs #15348

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 528d69d9982eac69e561a3ab7078488a94093d61..df551455c12dc8890a326f38b2e86f4b93adb4db 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -704,6 +704,8 @@ fpm_build_virtualenv () {
 
   COMMAND_ARR+=(".")
 
+  debug_echo -e "\n${COMMAND_ARR[@]}\n"
+
   FPM_RESULTS=$("${COMMAND_ARR[@]}")
   FPM_EXIT_CODE=$?
 
@@ -827,13 +829,13 @@ fpm_build () {
     COMMAND_ARR+=('--exclude' "$i")
   done
 
+  COMMAND_ARR+=("${fpm_args[@]}")
+
   # Append remaining function arguments directly to fpm's command line.
   for i; do
     COMMAND_ARR+=("$i")
   done
 
-  COMMAND_ARR+=("${fpm_args[@]}")
-
   COMMAND_ARR+=("$PACKAGE")
 
   debug_echo -e "\n${COMMAND_ARR[@]}\n"