Skip to content

Commit

Permalink
isTRUE/isFALSE in if cond for NA safety
Browse files Browse the repository at this point in the history
  • Loading branch information
@philipp-baumann
philipp-baumann committed Jan 14, 2024
1 parent 941001a commit d0e0af9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions R/find_rev.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ init <- function(project_path = ".",

cat("\n### Bootstrapping isolated, project-specific, and runtime-pure",
"R setup via Nix ###\n\n")
if (!dir.exists(project_path)) {
if (isFALSE(dir.exists(project_path))) {
dir.create(path = project_path, recursive = TRUE)
project_path <- normalizePath(path = project_path)
cat("==> Created isolated nix-R project folder:\n", project_path, "\n")
Expand Down Expand Up @@ -842,7 +842,7 @@ init <- function(project_path = ".",

switch(rprofile_action,
create_missing = {
if (rprofile_exists) {
if (isTRUE(rprofile_exists)) {
cat(
"\n* Keep existing `.Rprofile`. in `project_path`:\n",
paste0(project_path, "/"), "\n"
Expand All @@ -858,7 +858,7 @@ init <- function(project_path = ".",
set_message_session_PATH(message_type = message_type)
},
create_backup = {
if (rprofile_exists) {
if (isTRUE(rprofile_exists)) {
if (message_type == "verbose") {
cat("\n* Current lines of local `.Rprofile` are\n:")
cat(readLines(con = file(rprofile_file)), sep = "\n")
Expand Down Expand Up @@ -931,7 +931,7 @@ set_message_session_PATH <- function(message_type = c("simple", "verbose")) {
#' @noRd
is_nix_rsession <- function() {
is_nixr <- nzchar(Sys.getenv("NIX_STORE"))
if (is_nixr) {
if (isTRUE(is_nixr)) {
cat("==> R session running via Nix (nixpkgs)\n")
return(TRUE)
} else {
Expand All @@ -943,7 +943,7 @@ is_nix_rsession <- function() {
#' @noRd
is_rstudio_session <- function() {
is_rstudio <- Sys.getenv("RSTUDIO") == "1"
if (is_rstudio) {
if (isTRUE(is_rstudio)) {
cat("\n==> R session running from RStudio\n")
return(TRUE)
} else {
Expand All @@ -957,7 +957,7 @@ set_nix_path <- function() {
old_path <- Sys.getenv("PATH")
nix_path <- "/nix/var/nix/profiles/default/bin"
has_nix_path <- any(grepl(nix_path, old_path))
if (!has_nix_path) {
if (isFALSE(has_nix_path)) {
Sys.setenv(
PATH = paste(old_path, "/nix/var/nix/profiles/default/bin", sep = ":")
)
Expand All @@ -970,15 +970,15 @@ nix_rprofile <- function() {
quote( {
is_rstudio <- Sys.getenv("RSTUDIO") == "1"
is_nixr <- nzchar(Sys.getenv("NIX_STORE"))
if (!is_nixr && is_rstudio) {
if (isFALSE(is_nixr) && isTRUE(is_rstudio)) {
# Currently, RStudio does not propagate environmental variables defined in
# `$HOME/.zshrc`, `$HOME/.bashrc` and alike. This is workaround to
# make the path of the nix store and hence basic nix commands available
# in an RStudio session
old_path <- Sys.getenv("PATH")
nix_path <- "/nix/var/nix/profiles/default/bin"
has_nix_path <- any(grepl(nix_path, old_path))
if (!has_nix_path) {
if (isFALSE(has_nix_path)) {
Sys.setenv(
PATH = paste(
old_path, nix_path, sep = ":"
Expand All @@ -987,7 +987,7 @@ nix_rprofile <- function() {
}
}

if (is_nixr) {
if (isTRUE(is_nixr)) {
current_paths <- .libPaths()
userlib_paths <- Sys.getenv("R_LIBS_USER")
user_dir <- grep(paste(userlib_paths, collapse = "|"), current_paths)
Expand Down
18 changes: 9 additions & 9 deletions dev/build_envs.Rmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ init <- function(project_path = ".",
cat("\n### Bootstrapping isolated, project-specific, and runtime-pure",
"R setup via Nix ###\n\n")
if (!dir.exists(project_path)) {
if (isFALSE(dir.exists(project_path))) {
dir.create(path = project_path, recursive = TRUE)
project_path <- normalizePath(path = project_path)
cat("==> Created isolated nix-R project folder:\n", project_path, "\n")
Expand Down Expand Up @@ -941,7 +941,7 @@ init <- function(project_path = ".",
switch(rprofile_action,
create_missing = {
if (rprofile_exists) {
if (isTRUE(rprofile_exists)) {
cat(
"\n* Keep existing `.Rprofile`. in `project_path`:\n",
paste0(project_path, "/"), "\n"
Expand All @@ -957,7 +957,7 @@ init <- function(project_path = ".",
set_message_session_PATH(message_type = message_type)
},
create_backup = {
if (rprofile_exists) {
if (isTRUE(rprofile_exists)) {
if (message_type == "verbose") {
cat("\n* Current lines of local `.Rprofile` are\n:")
cat(readLines(con = file(rprofile_file)), sep = "\n")
Expand Down Expand Up @@ -1030,7 +1030,7 @@ set_message_session_PATH <- function(message_type = c("simple", "verbose")) {
#' @noRd
is_nix_rsession <- function() {
is_nixr <- nzchar(Sys.getenv("NIX_STORE"))
if (is_nixr) {
if (isTRUE(is_nixr)) {
cat("==> R session running via Nix (nixpkgs)\n")
return(TRUE)
} else {
Expand All @@ -1042,7 +1042,7 @@ is_nix_rsession <- function() {
#' @noRd
is_rstudio_session <- function() {
is_rstudio <- Sys.getenv("RSTUDIO") == "1"
if (is_rstudio) {
if (isTRUE(is_rstudio)) {
cat("\n==> R session running from RStudio\n")
return(TRUE)
} else {
Expand All @@ -1056,7 +1056,7 @@ set_nix_path <- function() {
old_path <- Sys.getenv("PATH")
nix_path <- "/nix/var/nix/profiles/default/bin"
has_nix_path <- any(grepl(nix_path, old_path))
if (!has_nix_path) {
if (isFALSE(has_nix_path)) {
Sys.setenv(
PATH = paste(old_path, "/nix/var/nix/profiles/default/bin", sep = ":")
)
Expand All @@ -1069,15 +1069,15 @@ nix_rprofile <- function() {
quote( {
is_rstudio <- Sys.getenv("RSTUDIO") == "1"
is_nixr <- nzchar(Sys.getenv("NIX_STORE"))
if (!is_nixr && is_rstudio) {
if (isFALSE(is_nixr) && isTRUE(is_rstudio)) {
# Currently, RStudio does not propagate environmental variables defined in
# `$HOME/.zshrc`, `$HOME/.bashrc` and alike. This is workaround to
# make the path of the nix store and hence basic nix commands available
# in an RStudio session
old_path <- Sys.getenv("PATH")
nix_path <- "/nix/var/nix/profiles/default/bin"
has_nix_path <- any(grepl(nix_path, old_path))
if (!has_nix_path) {
if (isFALSE(has_nix_path)) {
Sys.setenv(
PATH = paste(
old_path, nix_path, sep = ":"
Expand All @@ -1086,7 +1086,7 @@ nix_rprofile <- function() {
}
}
if (is_nixr) {
if (isTRUE(is_nixr)) {
current_paths <- .libPaths()
userlib_paths <- Sys.getenv("R_LIBS_USER")
user_dir <- grep(paste(userlib_paths, collapse = "|"), current_paths)
Expand Down

0 comments on commit d0e0af9

Please sign in to comment.