Fixed trinker#64. The following now works:

p_load(GOstats) but should be checked on Linux and Mac
englianhu · May 23, 2015 · 695eb30 · 695eb30
1 parent ae24428
commit 695eb30
Show file tree

Hide file tree

Showing 40 changed files with 50 additions and 51 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: pacman
 Type: Package
 Title: Package Management Tool
 Version: 0.3.1
-Date: 2015-05-20
+Date: 2015-05-23
 Authors@R: c(person("Tyler", "Rinker", role = c("aut", "cre", "ctb"),
         email = "[email protected]"), person("Dason",
         "Kurkiewicz", role = c("aut", "ctb"), email =

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.0): do not edit by hand
+# Generated by roxygen2 (4.1.1): do not edit by hand
 
 S3method(print,search_any)
 S3method(print,wide_table)

diff --git a/R/p_install.R b/R/p_install.R
@@ -51,20 +51,19 @@ function(package, character.only = FALSE, path = getOption("download_path"), ...
 
         response <- tryCatch(
             install.packages(package, ...),
-            warning = function(w) {
+            warning = function(w) {   
                 ## for users with bioconductor on installed, check to see if
                 ## package is available in the bioconductor repos
-                biocLite <- NULL
-                if ("Biobase" %in% p_lib()) {
-                    if (!exists('biocLite')) {
-                        source("http://bioconductor.org/biocLite.R")
-                    }
-                    suppressMessages(
-                        suppressWarnings(
-                            biocLite(package, suppressUpdates=TRUE)
-                        )
-                    )
-                }
+                if (!p_isinstalled('BiocInstaller')) {
+                    source("http://bioconductor.org/biocLite.R")
+                }           
+                suppressMessages(suppressWarnings(
+                    eval(parse(
+                        text=sprintf("BiocInstaller::biocLite('%s', suppressUpdates=TRUE)", 
+                            package)
+                    ))
+                ))
+
                 # preserve original warning message
                 return(w)
             }

diff --git a/man/p_author.Rd b/man/p_author.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_author.R
 \name{p_author}
 \alias{p_author}

diff --git a/man/p_base.Rd b/man/p_base.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_base.R
 \name{p_base}
 \alias{p_base}

diff --git a/man/p_boot.Rd b/man/p_boot.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_boot.R
 \name{p_boot}
 \alias{p_boot}

diff --git a/man/p_citation.Rd b/man/p_citation.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_citation.R
 \name{p_citation}
 \alias{p_citation}

diff --git a/man/p_cran.Rd b/man/p_cran.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_cran.R
 \name{p_cran}
 \alias{p_cran}

diff --git a/man/p_data.Rd b/man/p_data.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_data.R
 \name{p_data}
 \alias{p_data}

diff --git a/man/p_delete.Rd b/man/p_delete.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_delete.R
 \name{p_delete}
 \alias{p_del}

diff --git a/man/p_depends.Rd b/man/p_depends.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_depends.R
 \name{p_depends}
 \alias{p_depends}

diff --git a/man/p_detectOS.Rd b/man/p_detectOS.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_detectOS.R
 \name{p_detectOS}
 \alias{p_detectOS}

diff --git a/man/p_exists.Rd b/man/p_exists.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_exists.R
 \name{p_exists}
 \alias{p_exists}

diff --git a/man/p_extract.Rd b/man/p_extract.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_extract.R
 \name{p_extract}
 \alias{p_extract}

diff --git a/man/p_functions.Rd b/man/p_functions.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_functions.R
 \name{p_functions}
 \alias{p_functions}

diff --git a/man/p_help.Rd b/man/p_help.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_help.R
 \name{p_help}
 \alias{p_help}

diff --git a/man/p_information.Rd b/man/p_information.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_information.R
 \name{p_information}
 \alias{p_info}

diff --git a/man/p_install.Rd b/man/p_install.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_install.R
 \name{p_install}
 \alias{p_get}

diff --git a/man/p_install_gh.Rd b/man/p_install_gh.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_install_gh.R
 \name{p_install_gh}
 \alias{p_install_gh}

diff --git a/man/p_install_version.Rd b/man/p_install_version.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_install_version.R
 \name{p_install_version}
 \alias{p_install_version}

diff --git a/man/p_interactive.Rd b/man/p_interactive.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_interactive.R
 \name{p_interactive}
 \alias{p_inter}

diff --git a/man/p_isinstalled.Rd b/man/p_isinstalled.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_isinstalled.R
 \name{p_isinstalled}
 \alias{p_isinstalled}

diff --git a/man/p_library.Rd b/man/p_library.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_library.R
 \name{p_library}
 \alias{p_lib}

diff --git a/man/p_load.Rd b/man/p_load.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_load.R
 \name{p_load}
 \alias{p_load}

diff --git a/man/p_load_gh.Rd b/man/p_load_gh.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_load_gh.R
 \name{p_load_gh}
 \alias{p_load_gh}

diff --git a/man/p_loaded.Rd b/man/p_loaded.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_loaded.R
 \name{p_loaded}
 \alias{p_isloaded}

diff --git a/man/p_news.Rd b/man/p_news.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_news.R
 \name{p_news}
 \alias{p_news}

diff --git a/man/p_opendir.Rd b/man/p_opendir.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_opendir.R
 \name{p_opendir}
 \alias{p_opendir}

diff --git a/man/p_path.Rd b/man/p_path.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_path.R
 \name{p_path}
 \alias{p_path}

diff --git a/man/p_search_any.Rd b/man/p_search_any.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_search_any.R
 \name{p_search_any}
 \alias{p_sa}

diff --git a/man/p_search_library.Rd b/man/p_search_library.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_search_library.R
 \name{p_search_library}
 \alias{p_search_library}

diff --git a/man/p_set_cranrepo.Rd b/man/p_set_cranrepo.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_set_cranrepo.R
 \name{p_set_cranrepo}
 \alias{p_set_cranrepo}

diff --git a/man/p_temp.Rd b/man/p_temp.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_temp.R
 \name{p_temp}
 \alias{p_temp}

diff --git a/man/p_unload.Rd b/man/p_unload.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_unload.R
 \name{p_unload}
 \alias{p_unload}

diff --git a/man/p_unlock.Rd b/man/p_unlock.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_unlock.R
 \name{p_unlock}
 \alias{p_unlock}

diff --git a/man/p_update.Rd b/man/p_update.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_update.R
 \name{p_update}
 \alias{p_up}

diff --git a/man/p_version.Rd b/man/p_version.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_version.R
 \name{p_version}
 \alias{p_ver}

diff --git a/man/p_vignette.Rd b/man/p_vignette.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_vignette.R
 \name{p_vignette}
 \alias{p_vign}

diff --git a/man/print.search_any.Rd b/man/print.search_any.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_search_any.R
 \name{print.search_any}
 \alias{print.search_any}

diff --git a/man/print.wide_table.Rd b/man/print.wide_table.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/p_data.R
 \name{print.wide_table}
 \alias{print.wide_table}