From 944a6c86f6eab1c0b3d65c2f3f771764851baf05 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 9 Aug 2016 12:39:55 -0400
Subject: [PATCH] jjb: babeltrace cleanups

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/babeltrace.yaml             |  1 +
 scripts/babeltrace/build.sh      | 34 ++++++++++++++++----------------
 scripts/babeltrace/pylint.sh     | 12 +++++------
 scripts/babeltrace/scan-build.sh |  8 ++++----
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 97a2682..8e526d5 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -28,6 +28,7 @@
           branches:
             - origin/{version}
           basedir: src/babeltrace
+          skip-tag: true
 
     triggers:
       - pollscm:
diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 8666e1b..4dc939d 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -101,39 +101,39 @@ BUILD_PATH="$SRCDIR"
 case "$build" in
     oot)
         echo "Out of tree build"
-        BUILD_PATH=$WORKSPACE/oot
-        mkdir -p $BUILD_PATH
-        cd $BUILD_PATH
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix=$PREFIX $CONF_OPTS
+        BUILD_PATH="$WORKSPACE/oot"
+        mkdir -p "$BUILD_PATH"
+        cd "$BUILD_PATH"
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$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
         MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$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
 
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
 
     clang)
         echo "LLVM clang build"
         export CC=clang
         clang -v
-	MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix=$PREFIX $CONF_OPTS
+	MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
     *)
         echo "Standard in-tree build"
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix=$PREFIX $CONF_OPTS
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
 esac
 
@@ -151,16 +151,16 @@ rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='
 $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-find $PREFIX/bin -type f -perm -0500 -exec chrpath --delete {} \;
-find $PREFIX/lib -name "*.so" -exec chrpath --delete {} \;
+find "$PREFIX/bin" -type f -perm -0500 -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/babeltrace/pylint.sh b/scripts/babeltrace/pylint.sh
index 80637f6..dc3950c 100755
--- a/scripts/babeltrace/pylint.sh
+++ b/scripts/babeltrace/pylint.sh
@@ -25,20 +25,20 @@ BINDINGS_DIR="$BABELTRACE_DIR/lib/python${P3_VERSION}/dist-packages/babeltrace"
 PYENV_HOME="$WORKSPACE/.pyenv/"
 
 # Delete previously built virtualenv
-if [ -d $PYENV_HOME ]; then
-    rm -rf $PYENV_HOME
+if [ -d "$PYENV_HOME" ]; then
+    rm -rf "$PYENV_HOME"
 fi
 
 # Create virtualenv and install necessary packages
-virtualenv --system-site-packages -p ${PYTHON3} $PYENV_HOME
+virtualenv --system-site-packages -p ${PYTHON3} "$PYENV_HOME"
 
 set +u
-. $PYENV_HOME/bin/activate
+. "$PYENV_HOME/bin/activate"
 set -u
 
 pip install --quiet pylint
 pip install --quiet pep8
 
-pep8 --exclude="nativebt.py" $BINDINGS_DIR | tee pep8.out
+pep8 --exclude="nativebt.py" "$BINDINGS_DIR" | tee pep8.out
 
-pylint -f parseable --ignore="nativebt.py" $BINDINGS_DIR | tee pylint.out
+pylint -f parseable --ignore="nativebt.py" "$BINDINGS_DIR" | tee pylint.out
diff --git a/scripts/babeltrace/scan-build.sh b/scripts/babeltrace/scan-build.sh
index 887de62..117d5f9 100755
--- a/scripts/babeltrace/scan-build.sh
+++ b/scripts/babeltrace/scan-build.sh
@@ -44,13 +44,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
@@ -68,7 +68,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