diff --git a/util/debian-install/Vagrantfile b/util/debian-install/Vagrantfile index 0e9079e..053f779 100644 --- a/util/debian-install/Vagrantfile +++ b/util/debian-install/Vagrantfile @@ -7,7 +7,8 @@ VAGRANTFILE_API_VERSION = "2" require 'fileutils' debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V | tail -2`.split if debs.empty? - puts "W: no debs built in ../../pkg/; will install local ones, or none at all" + puts "W: no debs built in ../../pkg/; will either install existing local" + puts " ones, or the ones from the remote repository" else local_debs = Dir.glob('*.deb') debs.each do |f| diff --git a/util/debian-install/install b/util/debian-install/install index 8514d20..7d24802 100755 --- a/util/debian-install/install +++ b/util/debian-install/install @@ -69,6 +69,10 @@ apt-get update apt-get dist-upgrade -qy apt-get install -qy postgresql ruby1.8 -dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb -apt-cache policy noosfero -apt-get install -qyf +if dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb; then + apt-cache policy noosfero + apt-get install -qyf +else + apt-cache policy noosfero + apt-get install -qy noosfero noosfero-apache +fi -- libgit2 0.21.2