bootstrap-tarballs: decreased verboseness

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>

Author: larsewi

build-scripts/bootstrap-tarballs

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 _dir=$(readlink -e "$(dirname "$0")")
 # refactored a few functions into single file scripts for easier development/debugging, see ENT-12741 and ENT-12595
@@ -59,22 +59,30 @@ cd "$BASEDIR"/core
 rm -f cfengine-3.*.tar.gz
 git rev-parse HEAD > "$BASEDIR"/output/core-commitID
 # Configure in order to run "make dist", deleted later.
-./configure -C
-make dist
+echo "$(basename "$0"): Debug: Running configure on core repository..."
+run_and_print_on_failure ./configure -C
+echo "$(basename "$0"): Debug: Running make dist on core repository"
+run_and_print_on_failure make dist
 mv cfengine-3.*.tar.gz "$BASEDIR"/output/tarballs/
-make distclean
+echo "$(basename "$0"): Debug: Running make distclean on core repository"
+run_and_print_on_failure make distclean
 
 # Build tarballs from masterfiles repository
 cd "$BASEDIR"/masterfiles
 rm -f cfengine-masterfiles*.tar.gz
 git rev-parse HEAD > "$BASEDIR"/output/masterfiles-commitID
 # Configure in order to run "make dist", deleted later.
-./configure
-make dist         # source tarball
-make tar-package  # package tarball (containing all files as if they were
-                  # installed under "prefix".)
+echo "$(basename "$0"): Debug: Running configure on masterfiles repository..."
+run_and_print_on_failure ./configure
+echo "$(basename "$0"): Debug: Running make dist on masterfiles repository..."
+run_and_print_on_failure make dist         # source tarball
+echo "$(basename "$0"): Debug: Running make tar-package on masterfiles repository..."
+run_and_print_on_failure make tar-package  # package tarball (containing all
+                                           # files as if they were installed
+                                           # under "prefix".)
 mv cfengine-masterfiles*.tar.gz "$BASEDIR"/output/tarballs/
-make distclean
+echo "$(basename "$0"): Debug: Running make distclean on masterfiles repository..."
+run_and_print_on_failure make distclean
 
 # Compute a checksum list that can be used to verify the integrity of the
 # tarballs