1 files changed, 11 insertions, 11 deletions

diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index ed06dc26..73b335fe 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -5,7 +5,7 @@ ACTION="$1"
 set -eu
 
 CACHEDIR="$HOME/cache"
-NPROC=`nproc`
+NPROC=$(nproc)
 ASTYLE="$CACHEDIR/astyle/build/gcc/bin/astyle"
 ASTYLE_VERSION=3.1
 TRAVIS_TOOL="https://raw.githubusercontent.com/TokTok/ci-tools/master/bin/travis-haskell"
@@ -21,7 +21,7 @@ travis_install() {
     # Work around https://github.com/eddyxu/cpp-coveralls/issues/108 by manually
     # installing the pyOpenSSL module and injecting it into urllib3 as per
     # https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
-    sed -i -e '/^import sys$/a import urllib3.contrib.pyopenssl\nurllib3.contrib.pyopenssl.inject_into_urllib3()' `which coveralls`
+    sed -i -e '/^import sys$/a import urllib3.contrib.pyopenssl\nurllib3.contrib.pyopenssl.inject_into_urllib3()' "$(which coveralls)"
   }
 
   # Install astyle (version in ubuntu-precise too old).
@@ -34,15 +34,15 @@ travis_install() {
 }
 
 run_static_analysis() {
-  pylint -E other/analysis/check_recursion
+  pylint3 -E other/analysis/check_recursion
 
   export CPPFLAGS="-isystem $CACHEDIR/include"
   export LDFLAGS="-L$CACHEDIR/lib"
-  cat toxav/*.c toxcore/*.c toxencryptsave/*.c \
-    | clang `pkg-config --cflags libsodium opus vpx` \
-        -Itoxav -Itoxcore -Itoxencryptsave -S -emit-llvm -xc - -o- \
-    | opt -analyze -print-callgraph 2>&1 \
-    | other/analysis/check_recursion
+  cat toxav/*.c toxcore/*.c toxencryptsave/*.c |
+    clang "$(pkg-config --cflags libsodium opus vpx)" \
+      -Itoxav -Itoxcore -Itoxencryptsave -S -emit-llvm -xc - -o- |
+    opt -analyze -print-callgraph 2>&1 |
+    other/analysis/check_recursion
   other/analysis/run-clang
   other/analysis/run-clang-analyze
 }
@@ -85,10 +85,10 @@ travis_script() {
 
   cmake --build _build --parallel "$NPROC" --target install -- -k 0
 
-  cd _build  # pushd
-  ctest -j50 --output-on-failure || \
+  cd _build # pushd
+  ctest -j50 --output-on-failure ||
     ctest -j50 --output-on-failure --rerun-failed
-  cd -  # popd
+  cd - # popd
 }
 
 if [ "-z" "$ACTION" ]; then