compile: Reduced verbosity of script

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

Author: larsewi

build-scripts/compile

@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 . "$(dirname "$0")"/functions
 . detect-environment
@@ -12,21 +12,29 @@ case "$PROJECT" in
     NOVA=yes
     ;;
   *)
-    echo "Unknown project: $PROJECT"
+    echo "$(basename "$0"): Error: Unknown project: $PROJECT"
     exit 42;;
 esac
 
-$MAKE -C "$BASEDIR"/core -k
-$MAKE -C "$BASEDIR"/core install DESTDIR="$BASEDIR"/cfengine/dist
+echo "$(basename "$0"): Debug: Running make in core repo..."
+run_and_print_on_failure $MAKE -C "$BASEDIR"/core -k
+echo "$(basename "$0"): Debug: Running make install in core repo..."
+run_and_print_on_failure $MAKE -C "$BASEDIR"/core install DESTDIR="$BASEDIR"/cfengine/dist
 
 if [ "$NOVA" = yes ]; then
-    $MAKE -C "$BASEDIR"/enterprise -k
-    $MAKE -C "$BASEDIR"/enterprise install DESTDIR="$BASEDIR"/cfengine/dist
+    echo "$(basename "$0"): Debug: Running make in enterprise repo..."
+    run_and_print_on_failure $MAKE -C "$BASEDIR"/enterprise -k
+    echo "$(basename "$0"): Debug: Running make install in enterprise repo..."
+    run_and_print_on_failure $MAKE -C "$BASEDIR"/enterprise install DESTDIR="$BASEDIR"/cfengine/dist
     if [ "$ROLE" = hub ]; then
-        $MAKE -C "$BASEDIR"/nova -k
-        $MAKE -C "$BASEDIR"/nova install DESTDIR="$BASEDIR"/cfengine/dist
-        $MAKE -C "$BASEDIR"/masterfiles install DESTDIR="$BASEDIR"/cfengine/dist
+        echo "$(basename "$0"): Debug: Running make in nova repo..."
+        run_and_print_on_failure $MAKE -C "$BASEDIR"/nova -k
+        echo "$(basename "$0"): Debug: Running make install in nova repo..."
+        run_and_print_on_failure $MAKE -C "$BASEDIR"/nova install DESTDIR="$BASEDIR"/cfengine/dist
+        echo "$(basename "$0"): Debug: Running make install in masterfiles repo..."
+        run_and_print_on_failure $MAKE -C "$BASEDIR"/masterfiles install DESTDIR="$BASEDIR"/cfengine/dist
     fi
 else
-    $MAKE -C "$BASEDIR"/masterfiles install DESTDIR="$BASEDIR"/cfengine/dist
+    echo "$(basename "$0"): Debug: Running make install in masterfiles repo..."
+    run_and_print_on_failure $MAKE -C "$BASEDIR"/masterfiles install DESTDIR="$BASEDIR"/cfengine/dist
 fi