Merged
Conversation
Once the R script content is more generalized the other OS wrapper scripts can call this same R script.
Still need to fill in stubs for linux and osx cases.
This variable is available to a running R process even if it didn't exist when R started. This means we can use it for the appropriate per-user library path on a given install and not worry about OS detection.
== for strings, -eq for numbers! This is why it was trying to use the linux installer for osx.
system2 command arguments are given as a character vector, not as separate arguments.
test -d on the directory symlink, not test -f.
Otherwise it will create a symlink inside the target, making a circle.
These functions may be helpful from within an install (e.g. to keep the Desktop icon valid as #24 describes). This also removes the brittle attempts to autodetect paths and instead requires that the wrapper install script be called from the project dir and install() function be given a package source path.
This is more idiomatic for R packages. Also put AppleScript in tools/ as it is only needed when building the Mac OS wrapper.
R package handling won't put whole directories in exec. Need to keep the Mac OS .app directory separate from the executable scripts, then.
This should fix the extra dialog box that appears, and point to the new location of the wrapper scripts in the exec directory.
It is now explicitly used within the package, since some installation-related material was moved into R/installer.R.
Why did I have ":" as the key/val separator for the Exec line? Switched to "=".
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This centralizes most custom installation tasks inside the package itself in
R/installer.R, moves wrapper scripts (all except the Mac OS .app directory) frominst/binto the more typicalexec, and moves various build helpers intotools. The custom installer for each OS is also now tested during Travis builds using a wrappertools/travis_install_test.sh. From-scratch installation without a preexisting user R library directory now works on Windows, Mac, and Linux. Fixes #18.This also fixes a previously-implicit dependency on the devtools package (now explicitly required for the installer functions, in addition to the demo scripts) which should prevent any trouble now that R support in Travis has migrated to the remotes package for default dependency handling.