Skip to content

Commit 3b74a4f

Browse files
committed
native image launcher didn't pass internal args correctly
1 parent 12d5aa2 commit 3b74a4f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

com.oracle.truffle.r.native/run/install_r_native_image

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [[ $uninstall -eq 1 ]]; then
6363
fi
6464

6565
if [[ $silent -eq 0 ]]; then
66-
echo "This script is going to build a native image of the R runtime and update the R launchers to use that image as the default, i.e., when '--jvm' option is not used."
66+
echo "This script is going to build a native image of the R runtime and update the R launchers to use that image as the default, i.e., when '--jvm' option is not used. You can uninstall the native image by running this script with the 'uninstall' argument. Run this script with '--help' for more details."
6767
echo "The build takes several minutes and needs a minimum of 6GB of RAM and 150MB of free disk space. The computer may lag during the build."
6868
read -p "Are you sure you want to build and install the native image of the R runtime? (Yy/Nn) " -n 1 -r
6969
echo
@@ -78,6 +78,6 @@ cd "$fastr_home/bin"
7878
cp "exec/R" "exec_R.backup"
7979
cp "Rscript" "Rscript.backup"
8080
sed -e '/^## REMOVE FOR NATIVE IMAGE: BEGIN/,/^## REMOVE FOR NATIVE IMAGE: END/d;' "exec_R.backup" | \
81-
sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" R "${FASTR_INTERNAL_ARGS[@]}" "$@"|' > "exec/R"
81+
sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" R ${FASTR_INTERNAL_ARGS[@]} "$@"|' > "exec/R"
8282
sed -e '/^## REMOVE FOR NATIVE IMAGE: BEGIN/,/^## REMOVE FOR NATIVE IMAGE: END/d;' "Rscript.backup" | \
83-
sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" Rscript "${FASTR_INTERNAL_ARGS[@]}" "$@"|' > "Rscript"
83+
sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" Rscript ${FASTR_INTERNAL_ARGS[@]} "$@"|' > "Rscript"

0 commit comments

Comments
 (0)