Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 4 commits
  • 2 files changed
  • 0 commit comments
  • 3 contributors
Commits on Mar 20, 2012
@martiell martiell Fix download of VirtualBox Guest Additions on Debian.
`VBoxManage -v` on Debian reports a version number of the form:
4.1.8_Debianr75467
The URL from which to download the VBoxGuestAdditions ISO is derived
from the major/minor/incrmemental version numbers, but this was not
being correctly parsed from the version reported by VBoxManage.
bb545f8
@jedi4ever jedi4ever Merge pull request #260 from martiell/master
Fix download URL for VBoxGuestAdditions ISO on Debian hosts.
32dd781
Commits on Mar 21, 2012
@stagrlee update ruby and gems versions 1d00a81
@stagrlee Merge branch 'patrick' 6714a15
View
4 lib/veewee/provider/virtualbox/box/helper/version.rb
@@ -3,10 +3,12 @@ module Provider
module Virtualbox
module BoxCommand
+ # Return the major/minor/incremental version of VirtualBox.
+ # For example: 4.1.8_Debianr75467 -> 4.1.8
def vbox_version
command="#{@vboxcmd} --version"
shell_results=shell_exec("#{command}",{:mute => true})
- version=shell_results.stdout.strip.split('r')[0]
+ version=shell_results.stdout.strip.split(/[^0-9\.]/)[0]
return version
end
View
20 templates/ubuntu-12.04-server-amd64/postinstall.sh
@@ -34,22 +34,24 @@ apt-get -y install nfs-common
# Install Ruby from source in /opt so that users of Vagrant
# can install their own Rubies using packages or however.
-wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
-tar xvzf ruby-1.9.2-p290.tar.gz
-cd ruby-1.9.2-p290
+wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p125.tar.gz
+tar xvzf ruby-1.9.3-p125.tar.gz
+cd ruby-1.9.3-p125
./configure --prefix=/opt/ruby
make
make install
cd ..
-rm -rf ruby-1.9.2-p290
+rm -rf ruby-1.9.3-p125
+rm ruby-1.9.3-p125.tgz
-# Install RubyGems 1.7.2
-wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.11.tgz
-tar xzf rubygems-1.8.11.tgz
-cd rubygems-1.8.11
+# Install RubyGems 1.8.17
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.17.tgz
+tar xzf rubygems-1.8.17.tgz
+cd rubygems-1.8.17
/opt/ruby/bin/ruby setup.rb
cd ..
-rm -rf rubygems-1.8.11
+rm -rf rubygems-1.8.17
+rm rubygems-1.8.17.tgz
# Installing chef & Puppet
/opt/ruby/bin/gem install chef --no-ri --no-rdoc

No commit comments for this range

Something went wrong with that request. Please try again.