Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Move proj_path to a more appropriate place in use_addin #619

Merged
merged 9 commits into from
Mar 6, 2019
Merged

Move proj_path to a more appropriate place in use_addin #619

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b8a2c2b
Added use_addin as requested in #353
haozhu233 Jan 21, 2019
f2b3092
remove return inside invisible
haozhu233 Jan 21, 2019
3897410
Improved tests for use_addin; Added item to NEWS
haozhu233 Jan 24, 2019
5b3ac44
Following Hadley's comment, put in addin variable through render_temp…
haozhu233 Jan 24, 2019
f422bbc
make the newline part a little more dynamic
haozhu233 Jan 24, 2019
8a6c5f3
Tweak news bullet
hadley Feb 4, 2019
118c986
Merge upstream
haozhu233 Feb 4, 2019
e123539
Merge branch 'master' of github.com:haozhu233/usethis
haozhu233 Feb 4, 2019
c970fd5
Move proj_path up as Jenny suggested
haozhu233 Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions R/addin.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#'
#' @export
use_addin <- function(addin = "new_addin", open = interactive()) {
addin_dcf_path <- "inst/rstudio/addins.dcf"
addin_dcf_path <- proj_path("inst", "rstudio", "addins.dcf")

if (!file_exists(addin_dcf_path)) {
create_directory("inst/rstudio")
create_directory(proj_path("inst", "rstudio"))
file_create(addin_dcf_path)
ui_done("Creating {ui_path(addin_dcf_path)}")
}
Expand All @@ -24,7 +24,7 @@ use_addin <- function(addin = "new_addin", open = interactive()) {
ui_done("Adding binding to {ui_code(addin)} to addins.dcf.")

if (open) {
edit_file(proj_path(addin_dcf_path))
edit_file(addin_dcf_path)
}

invisible(TRUE)
Expand Down