diff --git a/.github/prehooks/commit-msg b/.github/prehooks/pre-commit similarity index 94% rename from .github/prehooks/commit-msg rename to .github/prehooks/pre-commit index 58e83f00..3b7d3a04 100755 --- a/.github/prehooks/commit-msg +++ b/.github/prehooks/pre-commit @@ -33,8 +33,15 @@ # This script runs before every commit # ######################################## -# check the commit message -COMMIT_MSG=$(cat "$1") +# try to fetch the commit message from the standard location +COMMIT_MSG_PATH=".git/COMMIT_EDITMSG" +if [ -f "$COMMIT_MSG_PATH" ]; then + COMMIT_MSG=$(cat "$COMMIT_MSG_PATH") +else + echo "Commit message file not found." + echo 1 +fi +# check the commit message, cancel commit if needed if [[ "$COMMIT_MSG" =~ \(no-check\)|\(no-checks\)|\(no-verify\) ]]; then echo "Not running pre-commit checks:" echo "Commit message contains '(no-check)', '(no-checks)', or '(no-verify)." @@ -42,7 +49,6 @@ if [[ "$COMMIT_MSG" =~ \(no-check\)|\(no-checks\)|\(no-verify\) ]]; then exit 0 fi - echo "Running pre-commit checks..." # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/DESCRIPTION b/DESCRIPTION index d9cbdc27..8f07d652 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9025 +Version: 2.1.1.9028 Date: 2024-04-24 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 5200bb9f..d4852e1f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9025 +# AMR 2.1.1.9028 *(this beta version will eventually become v3.0. We're happy to reach a new major milestone soon, which will be all about the new One Health support!)* diff --git a/R/sysdata.rda b/R/sysdata.rda index 18d9c980..c2bfedfa 100755 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ