Compare commits

..

No commits in common. "e05d0365a9d33d31b7481e6e1165eff0f505dc6e" and "bdbc112f998ada53a4c681bab90081d37536067c" have entirely different histories.

4 changed files with 18 additions and 17 deletions

View File

@ -5,7 +5,7 @@ echo "Running pre-commit hook..."
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo ">> Updating R documentation..."
if command -v Rscript > /dev/null; then
if "$(Rscript -e 'cat(all(c('"'roxygen2'"', '"'pkgload'"') %in% rownames(installed.packages())))')" == "TRUE"; then
if [ "$(Rscript -e 'cat(all(c('"'roxygen2'"', '"'pkgload'"') %in% rownames(installed.packages())))')" == "TRUE" ]; then
Rscript -e "suppressMessages(roxygen2::roxygenise())"
currentpkg=`Rscript -e "cat(pkgload::pkg_name())"`
git add man/*
@ -53,7 +53,7 @@ sed -i -- "s/^Version: .*/Version: ${currentversion}/" DESCRIPTION
sed -i -- "s/^Date: .*/Date: $(date '+%Y-%m-%d')/" DESCRIPTION
echo ">> - updated DESCRIPTION"
# remove leftover on macOS
rm -f DESCRIPTION--
rm DESCRIPTION--
# add to commit
git add DESCRIPTION
@ -62,7 +62,7 @@ if [ -e "NEWS.md" ]; then
sed -i -- "1s/.*/# ${currentpkg} ${currentversion}/" NEWS.md
echo ">> - updated NEWS.md"
# remove leftover on macOS
rm -f NEWS.md--
rm NEWS.md--
# add to commit
git add NEWS.md
else

View File

@ -1,6 +1,6 @@
Package: AMR
Version: 1.8.1.9026
Date: 2022-08-25
Version: 1.8.1.9021
Date: 2022-08-21
Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
data analysis and to work with microbial and antimicrobial properties by

View File

@ -1,4 +1,4 @@
# your 1.8.1.9026
# AMR 1.8.1.9021
### New
* EUCAST 2022 and CLSI 2022 guidelines have been added for `as.rsi()`. EUCAST 2022 is now the new default guideline for all MIC and disks diffusion interpretations.

View File

@ -32,7 +32,7 @@ template:
assets: "pkgdown/logos" # use logos in this folder
bslib:
code_font: {google: "Fira Code"}
# body-text-align: "justify"
body-text-align: "justify"
line-height-base: 1.75
# the green "success" colour of this bootstrap theme should be the same as the green in our logo
success: "#128f76"
@ -99,9 +99,9 @@ navbar:
- text: "Get properties of an antibiotic"
icon: "fa-capsules"
href: "reference/ab_property.html" # reference instead of an article
# - text: "Other: benchmarks"
# icon: "fa-shipping-fast"
# href: "articles/benchmarks.html"
- text: "Other: benchmarks"
icon: "fa-shipping-fast"
href: "articles/benchmarks.html"
- text: "Manual"
icon: "fa-book-open"
href: "reference/index.html"
@ -224,3 +224,4 @@ reference:
in a future version.
contents:
- "`AMR-deprecated`"