Merge pull request #193 from nicolasbock/indent_fix

Fix indent script

Author: nicolasbock

.github/workflows/CI.yaml

@@ -29,6 +29,18 @@ env:
   VERBOSE_MAKEFILE: yes
 
 jobs:
+  lint:
+    name: Lint sources
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Check out sources
+        uses: actions/checkout@v1
+      - name: Prepare container
+        run: ./prepare-container.sh
+      - run: bundle install
+      - run: bundle exec danger || true
+      - run: BML_OPENMP=no EMACS=emacs27 ./build.sh check_indent
+
   build:
     name: Build and test (${{ matrix.JOBNAME }})
     runs-on: ubuntu-18.04

Gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gem "danger", "<8"
+gem "danger-commit_lint"
+gem "danger-mention"
+gem "danger-prose"
+gem "danger-welcome_message"
+gem "faraday", "<1.1.0"

build.sh

@@ -15,14 +15,15 @@ Usage:
 This script can be used to build and test the progress library.  The script has to
 be given a command. Known commands are:
 
-create      - Create the build and install directories ('build' and 'install')
-configure   - Configure the build system
-compile     - Compile the sources
-install     - Install the compiled sources
-testing     - Run the test suite
-docs        - Generate the API documentation
-indent      - Indent the sources
-dist        - Generate a tar file (this only works with git)
+create          - Create the build and install directories ('build' and 'install')
+configure       - Configure the build system
+compile         - Compile the sources
+install         - Install the compiled sources
+testing         - Run the test suite
+docs            - Generate the API documentation
+indent          - Indent the sources
+check_indent    - Check the indentation of the sources
+dist            - Generate a tar file (this only works with git)
 
 The following environment variables can be set to influence the configuration
 step and the build:
@@ -155,11 +156,16 @@ testing() {
 }
 
 indent() {
-    cd "${BUILD_DIR}"
-    "${TOP_DIR}/indent.sh" 2>&1 | tee -a "${LOG_FILE}"
+    cd "${TOP_DIR}"
+    "${TOP_DIR}/indent.sh" 2>&1 | tee --append "${LOG_FILE}"
     check_pipe_error
+}
+
+check_indent() {
     cd "${TOP_DIR}"
-    git diff 2>&1 | tee -a "${LOG_FILE}"
+    "${TOP_DIR}/indent.sh" 2>&1 | tee --append "${LOG_FILE}"
+    check_pipe_error
+    git diff 2>&1 | tee --append "${LOG_FILE}"
     check_pipe_error
     LINES=$(git diff | wc -l)
     if test ${LINES} -gt 0; then
@@ -211,9 +217,12 @@ if [[ $# -gt 0 ]]; then
             testing
             ;;
         "indent")
-            create
             indent
             ;;
+        "check_indent")
+            create
+            check_indent
+            ;;
         "dist")
             create
             configure