X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fpylint.sh;h=dc3950c0451af5a571db15ffcb66be0462b64395;hb=944a6c86f6eab1c0b3d65c2f3f771764851baf05;hp=0971938529e72233540c260cc43040a6ceddfe3d;hpb=890bff2382ecd077d009f4315ca2233c0f6f31cd;p=lttng-ci.git

diff --git a/scripts/babeltrace/pylint.sh b/scripts/babeltrace/pylint.sh
old mode 100644
new mode 100755
index 0971938..dc3950c
--- a/scripts/babeltrace/pylint.sh
+++ b/scripts/babeltrace/pylint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -exu
 #
 # Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
 #
@@ -15,22 +15,30 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-BABELTRACE_DIR="dependencies/babeltrace/build"
-BINDINGS_DIR="$BABELTRACE_DIR/lib/python3.4/dist-packages/babeltrace"
+BABELTRACE_DIR="deps/babeltrace/build"
+
+PYTHON3=python3
+P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+
+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
-. $PYENV_HOME/bin/activate
+virtualenv --system-site-packages -p ${PYTHON3} "$PYENV_HOME"
+
+set +u
+. "$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