]> https://gitweb.dealii.org/ - dealii.git/commitdiff
contrib: update auxiliary scripts
authorMatthias Maier <tamiko@43-1.org>
Wed, 20 Jun 2018 22:03:24 +0000 (17:03 -0500)
committerMatthias Maier <tamiko@43-1.org>
Wed, 20 Jun 2018 22:04:11 +0000 (17:04 -0500)
contrib/git-hooks/pre-commit
contrib/utilities/check_indentation.sh

index fe8b9aae6fe4e53fdee6e819699392e5b53e77d5..54c0655016a9b4cd27e350d77db3f34d7b38a972 100755 (executable)
 
 BASEDIR="$(git rev-parse --show-toplevel 2>/dev/null)"
 
-if [ ! -f "${BASEDIR}"/contrib/utilities/indent-branch ]; then
+if [ ! -f "${BASEDIR}"/contrib/utilities/indent ]; then
   echo "*** This script must be run from within the deal.II git repository."
   exit 1
 fi
 
 cd "${BASEDIR}"
-OUTPUT="$(REPORT_ONLY=true "${BASEDIR}"/contrib/utilities/indent-branch)"
+OUTPUT="$(REPORT_ONLY=true "${BASEDIR}"/contrib/utilities/indent)"
 
 if [ ! -z "${OUTPUT}" ]; then
   echo "git commit aborted due to formatting issues:"
   echo "${OUTPUT}"
   echo ""
-  echo "Please run ./contrib/utilities/indent-branch to fix these issues and try again."
+  echo "Please run ./contrib/utilities/indent to fix these issues and try again."
   exit 1
 fi
index fa81f582f7c9c7adb6e2a9536bbccdfc7b30736f..a14a67859aef6078295ae99d515c4b821b882781 100755 (executable)
@@ -34,6 +34,6 @@ else
        echo "Running indentation test on Pull Request #${TRAVIS_PULL_REQUEST}"
 fi
 
-./contrib/utilities/indent
+./contrib/utilities/indent-all
 git diff
 git diff-files --quiet 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.