Merge branch 'master' of https://github.com/Exp-Micro-Ecol-Hub/dmdScheme

# Conflicts:
#	R/scheme_install_r_package.R

Makefile

@@ -30,6 +30,16 @@ READMERMD = Readme.Rmd
 READMEMD = Readme.md
 READMEHTML = Readme.html
 
+SCHEMEMAKE = library(dmdScheme); \
+	setwd('SCHEME_PACKAGE'); \
+	scheme_make( \
+		schemeDefinition = 'dmdScheme.xlsx', \
+		examples = list.dirs('examples/', recursive = FALSE), \
+		install_R_package = 'install_R_package.R', \
+		path = '.', \
+		overwrite = TRUE \
+	)
+
 #############
 
 all: check clean_web web clean_check
@@ -38,6 +48,12 @@ all: check clean_web web clean_check
 
 clean: clean_web
 
+########### scheme package ###########
+
+scheme_package:
+	Rscript -e "$(SCHEMEMAKE)"
+
+
 ########### Website ###########
 
 ####
@@ -150,4 +166,4 @@ list: list_variables list_targets
 
 #############
 
-.PHONY: list files update clean clean_vignettes clean_web clean_html publish docs
+.PHONY: list files update clean clean_vignettes clean_web clean_html publish docs scheme_package

NAMESPACE

@@ -96,10 +96,12 @@ importFrom(utils,URLencode)
 importFrom(utils,browseURL)
 importFrom(utils,download.file)
 importFrom(utils,glob2rx)
+importFrom(utils,installed.packages)
 importFrom(utils,package.skeleton)
 importFrom(utils,packageName)
 importFrom(utils,packageVersion)
 importFrom(utils,read.csv)
+importFrom(utils,remove.packages)
 importFrom(utils,untar)
 importFrom(utils,write.table)
 importFrom(writexl,write_xlsx)

R/scheme_install_r_package.R

@@ -10,6 +10,7 @@
 #'
 #' @rdname scheme
 #'
+#' @importFrom utils installed.packages remove.packages
 #' @export
 #'
 #' @examples
@@ -30,7 +31,7 @@ scheme_install_r_package <- function(
     installed <- system.file(package = name) != ""
     if (installed) {
       if (reinstall) {
-        remove.packages("name")
+        utils::remove.packages("name")
       } else {
         message(
           "Package ", name, " is already installed!\n",

SCHEME_PACKAGE/install_R_package.R

@@ -1 +1,6 @@
-devtools::install_github("Exp-Micro-Ecol-Hub/dmdScheme",ref = "master", force = TRUE)
+devtools::install_github(
+  repo = "Exp-Micro-Ecol-Hub/dmdScheme",
+  ref = "master",
+  force = TRUE,
+  upgrade = "never"
+)