You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2012/10/07 11:48:05 UTC
svn commit: r1395260 - /buildr/trunk/.rvmrc
Author: donaldp
Date: Sun Oct 7 09:48:05 2012
New Revision: 1395260
URL: http://svn.apache.org/viewvc?rev=1395260&view=rev
Log:
Wrap all the calls rvm in another shell
Modified:
buildr/trunk/.rvmrc
Modified: buildr/trunk/.rvmrc
URL: http://svn.apache.org/viewvc/buildr/trunk/.rvmrc?rev=1395260&r1=1395259&r2=1395260&view=diff
==============================================================================
--- buildr/trunk/.rvmrc (original)
+++ buildr/trunk/.rvmrc Sun Oct 7 09:48:05 2012
@@ -18,21 +18,21 @@ export BUILDR_GEMSET=${BUILDR_GEMSET-`ba
detected_version=`rvm list strings | grep ${BUILDR_RUBY_VERSION}`
if [ "X" == "X${detected_version}" ]; then
echo "${BUILDR_RUBY_VERSION} was not found, running 'rvm install ${BUILDR_RUBY_VERSION}'..."
- rvm install ${BUILDR_RUBY_VERSION}
+ bash rvm install ${BUILDR_RUBY_VERSION}
fi
# Force the creation of the gemset
-rvm use "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" --create
+bash rvm use "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" --create
export JRUBY_OPTS="-J-XX:MaxPermSize=312m -J-Xmx1024M"
export JAVA_OPTS="-Xmx1024m -XX:MaxPermSize=312m"
if [ -f Gemfile ]; then
- rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec gem list | grep 'bundler' &> /dev/null
+ bash rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec gem list | grep 'bundler' &> /dev/null
if [ $? -gt 0 ]; then
echo "Installing bundler..."
- rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec gem install bundler
+ bash rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec gem install bundler
fi
rm -f Gemfile.lock
- rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec bundle install --no-binstubs | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'
+ bash rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec bundle install --no-binstubs
fi