X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flttng-analyses%2Fpylint.sh;h=426fcc4b6632b6a4e01d02ec2d96544281de8d27;hb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;hp=334cda525ffe9a0c143f43e49106d011d6e2bacc;hpb=2fa717701e8c4448daa69ad3db0ad3e1a78e68a0;p=lttng-ci.git

diff --git a/scripts/lttng-analyses/pylint.sh b/scripts/lttng-analyses/pylint.sh
index 334cda5..426fcc4 100755
--- a/scripts/lttng-analyses/pylint.sh
+++ b/scripts/lttng-analyses/pylint.sh
@@ -1,6 +1,6 @@
-#!/bin/sh -exu
+#!/bin/bash
 #
-# Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,29 +15,38 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
+SRCDIR="src/lttng-analyses"
+
+PYTHON3="python3"
+P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
 
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 
 export LD_LIBRARY_PATH="$BABELTRACE_DIR/lib"
-export PYTHONPATH="$BABELTRACE_DIR/python3.4/dist-packages/"
+export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/site-packages/"
 
 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
-set -u
+set +ux
+# shellcheck disable=SC1090
+. "$PYENV_HOME/bin/activate"
+set -ux
 
 pip install --quiet pylint
 pip install --quiet pep8
 
-pep8 lttnganalyses | tee pep8.out
 
-pylint -f parseable --ignore="_version.py" lttnganalyses | tee pylint.out
+cd "$SRCDIR"
+
+pep8 lttnganalyses | tee "$WORKSPACE/pep8.out"
+pylint -f parseable --ignore="_version.py" --disable=C0111 lttnganalyses | tee "$WORKSPACE/pylint.out"