From 89b9225ee8fb4437b08377c8c9942c6ea574c214 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 9 Aug 2016 12:56:38 -0400
Subject: [PATCH] jjb: lttng-ust cleanups

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-ust.yaml             |  2 ++
 scripts/lttng-ust/build.sh      | 32 ++++++++++++++++----------------
 scripts/lttng-ust/scan-build.sh |  8 ++++----
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index b90d27c..3f8971d 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -23,6 +23,7 @@
           branches:
             - origin/{version}
           basedir: src/lttng-ust
+          skip-tag: true
 
     triggers:
       - pollscm:
@@ -158,6 +159,7 @@
           branches:
             - origin/{version}
           basedir: lttng-ust-java-tests
+          skip-tag: true
 
     triggers:
       - pollscm:
diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 21094f5..ccb3683 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -94,37 +94,37 @@ case "$build" in
 oot)
     echo "Out of tree build"
     BUILD_PATH=$WORKSPACE/oot
-    mkdir -p $BUILD_PATH
-    cd $BUILD_PATH
-    $SRCDIR/configure --prefix=$PREFIX $CONF_OPTS
+    mkdir -p "$BUILD_PATH"
+    cd "$BUILD_PATH"
+    "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 dist)
     echo "Distribution out of tree build"
-    BUILD_PATH=`mktemp -d`
+    BUILD_PATH="`mktemp -d`"
 
     # Initial configure and generate tarball
-    $SRCDIR/configure
+    "$SRCDIR/configure"
     $MAKE dist
 
-    mkdir -p $BUILD_PATH
-    cp *.tar.* $BUILD_PATH/
-    cd $BUILD_PATH
+    mkdir -p "$BUILD_PATH"
+    cp ./*.tar.* "$BUILD_PATH/"
+    cd "$BUILD_PATH"
 
     # Ignore level 1 of tar
-    $TAR xvf *.tar.* --strip 1
+    $TAR xvf ./*.tar.* --strip 1
 
-    $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 *)
     echo "Standard in-tree build"
-    $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 esac
 
 # BUILD!
-$MAKE -j `$NPROC` V=1
+$MAKE -j "`$NPROC`" V=1
 $MAKE install
 
 # Run tests
@@ -137,15 +137,15 @@ rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='
 $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-find $PREFIX/lib -name "*.so" -exec chrpath --delete {} \;
+find "$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
 
 # Remove libtool .la files
-find $PREFIX/lib -name "*.la" -exec rm -f {} \;
+find "$PREFIX/lib" -name "*.la" -exec rm -f {} \;
 
 # Clean temp dir for dist build
 if [ "$build" = "dist" ]; then
-    cd $SRCDIR
-    rm -rf $BUILD_PATH
+    cd "$SRCDIR"
+    rm -rf "$BUILD_PATH"
 fi
 
 # EOF
diff --git a/scripts/lttng-ust/scan-build.sh b/scripts/lttng-ust/scan-build.sh
index 39933e3..0eebb7f 100755
--- a/scripts/lttng-ust/scan-build.sh
+++ b/scripts/lttng-ust/scan-build.sh
@@ -52,13 +52,13 @@ cd "$SRCDIR"
 ./bootstrap
 
 
-./configure --prefix=$PREFIX
+./configure --prefix="$PREFIX"
 
 # generate the scan-build report
-scan-build -k -o ${SCAN_BUILD_TMPDIR} make
+scan-build -k -o "${SCAN_BUILD_TMPDIR}" make
 
 # get the directory name of the report created by scan-build
-SCAN_BUILD_REPORT=$( find ${SCAN_BUILD_TMPDIR} -maxdepth 1 -not -empty -not -name `basename ${SCAN_BUILD_TMPDIR}` )
+SCAN_BUILD_REPORT=$( find "${SCAN_BUILD_TMPDIR}" -maxdepth 1 -not -empty -not -name "`basename ${SCAN_BUILD_TMPDIR}`" )
 rc=$?
 
 if [ -z "${SCAN_BUILD_REPORT}" ]; then
@@ -76,7 +76,7 @@ else
     fi
 
     echo ">>> Archiving scan-build report to ${SCAN_BUILD_ARCHIVE}"
-    mv ${SCAN_BUILD_REPORT}/* ${SCAN_BUILD_ARCHIVE}/
+    mv "${SCAN_BUILD_REPORT}/*" "${SCAN_BUILD_ARCHIVE}/"
 
     echo ">>> Removing any temporary files and directories"
     rm -rf "${SCAN_BUILD_TMPDIR}"
-- 
2.34.1