Author: donaldp
Date: Fri Oct 11 23:49:01 2013
New Revision: 1531464
URL: http://svn.apache.org/r1531464
Log:
Rework the script to deal with non-presence of bundler from the get go
Modified:
buildr/trunk/ci-setup.sh
Modified: buildr/trunk/ci-setup.sh
URL:
http://svn.apache.org/viewvc/buildr/trunk/ci-setup.sh?rev=1531464&r1=1531463&r2=1531464&view=diff
==============================================================================
--- buildr/trunk/ci-setup.sh (original)
+++ buildr/trunk/ci-setup.sh Fri Oct 11 23:49:01 2013
@@ -4,15 +4,17 @@ update_bundler() {
gem install bundler
fi
if [ "$1" = 'quiet' ]; then
- bundle install --deployment > /dev/null 2> /dev/null
+ bundle update #> /dev/null 2> /dev/null
else
- bundle install --deployment
+ bundle update
fi
+ bundle check > /dev/null 2> /dev/null
+ return $?
}
i="0"
-until (bundle check > /dev/null 2> /dev/null) || [ $i -gt 10 ]; do
+until (bundle check > /dev/null 2> /dev/null) || (update_bundler 'quiet') || [
$i -gt 10 ]; do
echo "Bundle update. Attempt: $i"
update_bundler 'quiet'
i=$[$i+1]
