From 0fc293fa0b540a35f01d7933db5aa9ff7a9d1648 Mon Sep 17 00:00:00 2001 From: Philipp Baumann Date: Tue, 26 Sep 2023 15:31:58 +0200 Subject: [PATCH] fix missing ";\n" --- R/find_rev.R | 3 ++- dev/build_envs.Rmd | 3 ++- inst/extdata/default.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/R/find_rev.R b/R/find_rev.R index c97aef86..81ab24fb 100644 --- a/R/find_rev.R +++ b/R/find_rev.R @@ -473,11 +473,12 @@ get_system_pkgs(system_pkgs)) LC_PAPER = "en_US.UTF-8" ) ) - paste( + locale_vars <- paste( Map(function(x, nm) paste0(nm, " = ", x), nm = names(locale_variables), x = locale_variables), collapse = ";\n " ) + paste0(locale_vars, ";\n") } generate_rstudio_pkgs <- function(ide, flag_git_archive, flag_rpkgs){ diff --git a/dev/build_envs.Rmd b/dev/build_envs.Rmd index 07397172..04b7fe94 100644 --- a/dev/build_envs.Rmd +++ b/dev/build_envs.Rmd @@ -557,11 +557,12 @@ get_system_pkgs(system_pkgs)) LC_PAPER = "en_US.UTF-8" ) ) - paste( + locale_vars <- paste( Map(function(x, nm) paste0(nm, " = ", x), nm = names(locale_variables), x = locale_variables), collapse = ";\n " ) + paste0(locale_vars, ";\n") } generate_rstudio_pkgs <- function(ide, flag_git_archive, flag_rpkgs){ diff --git a/inst/extdata/default.nix b/inst/extdata/default.nix index 1f979cdc..df518669 100644 --- a/inst/extdata/default.nix +++ b/inst/extdata/default.nix @@ -37,7 +37,7 @@ let LC_ALL = en_US.UTF-8; LC_TIME = en_US.UTF-8; LC_MONETARY = en_US.UTF-8; - LC_PAPER = en_US.UTF-8 + LC_PAPER = en_US.UTF-8; buildInputs = [ git_archive_pkgs system_packages ]; shellHook = "R --vanilla"; }