Fixup whitespace and configure CI to keep it that way

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.0.1
+  hooks:
+    - id: trailing-whitespace
+    - id: end-of-file-fixer
+    - id: check-yaml
+    - id: check-added-large-files
+- repo: https://github.com/jumanjihouse/pre-commit-hooks
+  rev: 2.1.5
+  hooks:
+    - id: shellcheck

.travis.yml

@@ -1,11 +1,14 @@
 dist: focal
-sudo: enabled
 
-language:
-    - c
+language: c
+
+cache:
+  - pip
+
 addons:
   apt:
     packages:
+    - shellcheck
     - valgrind
     - gcc
     - clang
@@ -16,6 +19,13 @@ addons:
     - meson
     - python3-pytest
     - libglib2.0-dev
-install: test/travis-install.sh
-script: test/travis-build.sh
 
+install: test/travis-install.sh
+
+jobs:
+  include:
+    - name: Lint
+      script: ./test/lint.sh
+      install: skip
+    - name: Build + Test
+      script: test/travis-build.sh

make_release_tarball.sh

@@ -27,4 +27,3 @@ gpg --armor --detach-sign "${TAG}.tar.xz"
 PREV_TAG="$(git tag --list 'sshfs-3*' --sort=-taggerdate --merged "${TAG}^"| head -1)"
 echo "Contributors from ${PREV_TAG} to ${TAG}:"
 git log --pretty="format:%an <%aE>" "${PREV_TAG}..${TAG}" | sort -u
-

meson.build

@@ -69,4 +69,3 @@ meson.add_install_script('utils/install_helper.sh',
 
 
 subdir('test')
-

test/appveyor-build.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 machine=$(uname -m)
 mkdir "build-$machine"

test/lint.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+pip3 install --user pre-commit
+pre-commit run --all-files --show-diff-on-failure

test/travis-build.sh

@@ -6,36 +6,40 @@ set -e
 # that we still need to fix
 export ASAN_OPTIONS="detect_leaks=0"
 
-export LSAN_OPTIONS="suppressions=$(pwd)/test/lsan_suppress.txt"
+export LSAN_OPTIONS="suppressions=${PWD}/test/lsan_suppress.txt"
 export CC
 
 TEST_CMD="python3 -m pytest --maxfail=99 test/"
 
 # Standard build with Valgrind
 for CC in gcc clang; do
+    (
     mkdir "build-${CC}"; cd "build-${CC}"
     if [ "${CC}" == 'gcc-6' ]; then
         build_opts='-D b_lundef=false'
     else
         build_opts=''
     fi
+    # shellcheck disable=SC2086
     meson -D werror=true ${build_opts} ../
     ninja
 
     TEST_WITH_VALGRIND=true ${TEST_CMD}
-    cd ..
+    )
 done
 (cd "build-${CC}"; sudo ninja install)
 
 # Sanitized build
 CC=clang
 for san in undefined address; do
-    mkdir "build-${san}"; cd "build-${san}"
+    (
+    mkdir "build-${san}"
+    cd "build-${san}"
     # b_lundef=false is required to work around clang
     # bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
     meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
     ninja
     ${TEST_CMD}
     sudo ninja install
-    cd ..
+    )
 done