[Git][noosfero/noosfero][stable-1.7] Merge branch 'travis_fix_orders' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.7 at Noosfero / noosfero


Commits:
e0418372 by Rodrigo Souto at 2017-03-08T13:42:38+00:00
Merge branch 'travis_fix_orders' into 'master'

Fixes orders plugin installation procedure

See merge request !1129
- - - - -


1 changed file:

- plugins/orders/install.rb


Changes:

=====================================
plugins/orders/install.rb
=====================================
--- a/plugins/orders/install.rb
+++ b/plugins/orders/install.rb
@@ -4,17 +4,18 @@ sources_file = File.join(File.expand_path(File.dirname(__FILE__)), 'noosfero-jes
 repo_url = 'http://download.noosfero.org/debian/jessie-test'
 needs_update = false
 
-unless system "sudo grep -q '#{repo_url}' /etc/apt/sources.list /etc/apt/sources.list.d/*"
-  print 'To install this plugin, you must add noosfero-jessie-test to you sources list, Do you want to proceed? (yes/no): '
-  answer = gets.strip.downcase
-  exit(1) unless answer == 'yes' || answer == 'y'
+unless  ENV['NOOSFERO_BUNDLE_OPTS'] == 'install' || system('dpkg -s ruby-axlsx')
+  unless system "sudo grep -q '#{repo_url}' /etc/apt/sources.list /etc/apt/sources.list.d/*"
+    puts 'To install this plugin, you must add noosfero-jessie-test to you sources list.'
+    print 'Do you want to proceed? [(y)es/(n)o]: '
+    answer = gets.strip.downcase
+    exit(1) unless answer == 'yes' || answer == 'y'
 
-  puts '>>> Adding Noosfero jessie-test to your sources...'
-  FileUtils.cp(sources_file, '/etc/apt/sources.list.d/')
-  needs_update = true
-end
+    puts '>>> Adding Noosfero jessie-test to your sources...'
+    FileUtils.cp(sources_file, '/etc/apt/sources.list.d/')
+    needs_update = true
+  end
 
-unless system 'dpkg -s ruby-axlsx'
   puts '>>> Installing ruby-axlsx...'
   system 'sudo apt-get update' if needs_update
   unless system 'sudo apt-get install -y ruby-axlsx'



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/e0418372ec9e5403f10545ad58287d8dd692ca19
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170308/0e1ed8b4/attachment-0001.html>