fix missing pkgs.mkShell when shell_hook = NULL

ropensci · Oct 6, 2023 · d853744 · d853744
1 parent 15d82ad
commit d853744
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/find_rev.R b/R/find_rev.R
@@ -517,9 +517,9 @@ flag_rpkgs
 
   flag_rstudio <- if (ide == "rstudio") "rstudio_pkgs" else  ""
 
-  shell_hook <- if (!is.null(shell_hook)) {
+  shell_hook <- if (!is.null(shell_hook) && nzchar(shell_hook)) {
     paste0('shellHook = "', shell_hook, '";')
-  }
+  } else {''}
 
   # Generate the shell
   generate_shell <- function(flag_git_archive,

diff --git a/dev/build_envs.Rmd b/dev/build_envs.Rmd
@@ -601,9 +601,9 @@ flag_rpkgs
 
   flag_rstudio <- if (ide == "rstudio") "rstudio_pkgs" else  ""
 
-  shell_hook <- if (!is.null(shell_hook)) {
+  shell_hook <- if (!is.null(shell_hook) && nzchar(shell_hook)) {
     paste0('shellHook = "', shell_hook, '";')
-  }
+  } else {''}
 
   # Generate the shell
   generate_shell <- function(flag_git_archive,