Mercurial > repos > iuc > package_r_3_1_0

changeset 1:cfa09c247b6e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author iuc
date Wed, 18 Feb 2015 11:34:00 -0500
parents a6cc7706ea14
children f73b7d3acd65
files tool_dependencies.xml
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Sun Aug 03 08:01:46 2014 -0400
+++ b/tool_dependencies.xml	Wed Feb 18 11:34:00 2015 -0500
@@ -24,7 +24,7 @@
                 </actions>
                 <actions>
                     <package name="readline" version="6.2">
-                        <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                        <repository changeset_revision="4e4f3dc94efa" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                     </package>
                     <package name="libpng" version="1.6.7">
                         <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
@@ -40,7 +40,7 @@
                     </package>
                     <action type="download_by_url">http://cran.rstudio.com/src/base/R-3/R-3.1.0.tar.gz</action>
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="246f31787ca1" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="4e4f3dc94efa" name="package_readline_6_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                             <package name="readline" version="6.2" />
                         </repository>
                         <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
@@ -75,11 +75,11 @@
                                     --enable-R-shlib \
                                     --disable-R-framework \
                                     --libdir=$INSTALL_DIR/lib \
-                                    --prefix=$INSTALL_DIR 
+                                    --prefix=$INSTALL_DIR
                     </action>
                     <action type="make_install" />
-                    <action type="shell_command">sed -i.bak 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action>
-                    <action type="shell_command">sed -i.bak 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R</action>
+                    <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action>
+                    <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R</action>
                 </actions>
                 <action type="set_environment">
                     <environment_variable action="set_to" name="R_DOC_DIR">$INSTALL_DIR/lib/R/doc</environment_variable>