-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "turn off line endings conversion on windows"
This reverts commit f1a300f.
- Loading branch information
1 parent
dc8c260
commit 5cadd55
Showing
3 changed files
with
20 additions
and
21 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,2 @@ | ||
#!/usr/bin/env sh | ||
|
||
# adapted from https://github.com/tidyverse/purrr/blob/main/configure | ||
|
||
# Check that this is not just ./configure. We need to run this | ||
# from R CMD INSTALL, to have the R env vars set. | ||
|
||
if [ -z "$R_HOME" ]; then | ||
echo >&2 R_HOME is not set, are you running R CMD INSTALL? | ||
exit 1 | ||
fi | ||
|
||
# Find the R binary we need to use. This is a bit trickier on | ||
# Windows, because it has two architectures. On windows R_ARCH_BIN | ||
# is set, so this should work everywhere. | ||
RBIN="${R_HOME}/bin${R_ARCH_BIN}/R" | ||
|
||
"$RBIN" --vanilla --slave -f tools/configure.R | ||
#! /usr/bin/env sh | ||
sh ./configure_win |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/usr/bin/env sh | ||
|
||
# adapted from https://github.com/tidyverse/purrr/blob/main/configure | ||
|
||
# Check that this is not just ./configure. We need to run this | ||
# from R CMD INSTALL, to have the R env vars set. | ||
|
||
if [ -z "$R_HOME" ]; then | ||
echo >&2 R_HOME is not set, are you running R CMD INSTALL? | ||
exit 1 | ||
fi | ||
|
||
# Find the R binary we need to use. This is a bit trickier on | ||
# Windows, because it has two architectures. On windows R_ARCH_BIN | ||
# is set, so this should work everywhere. | ||
RBIN="${R_HOME}/bin${R_ARCH_BIN}/R" | ||
|
||
"$RBIN" --vanilla --slave -f tools/configure.R |