[Git][noosfero/noosfero][master] 2 commits: orders: remove hard limitation on debian

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
14bc68c2 by Braulio Bhavamitra at 2017-03-13T20:28:40-03:00
orders: remove hard limitation on debian

- - - - -
23073d5e by Braulio Bhavamitra at 2017-03-13T20:29:21-03:00
feed_updater: no need to be executable, script/feed-updater is better

- - - - -


3 changed files:

- app/services/feed_updater.rb
- plugins/orders/install.rb
- − plugins/orders/noosfero-jessie-test.list


Changes:

=====================================
app/services/feed_updater.rb
=====================================
--- a/app/services/feed_updater.rb
+++ b/app/services/feed_updater.rb
@@ -1,8 +1,3 @@
-# to run by hand
-if $PROGRAM_NAME == __FILE__
-  require File.dirname(__FILE__) + '/../config/environment'
-end
-
 # This class implements the feed updater. To change how often a feed gets
 # updated, change FeedUpdater#update_interval in your config/local.rb file like
 # this:
@@ -103,8 +98,3 @@ Backtrace:
     end
   end
 end
-
-# run the updater
-if ($PROGRAM_NAME == __FILE__)
-  FeedUpdater.new.start
-end


=====================================
plugins/orders/install.rb
=====================================
--- a/plugins/orders/install.rb
+++ b/plugins/orders/install.rb
@@ -1,27 +1,2 @@
-require 'fileutils'
-
-sources_file = File.join(File.expand_path(File.dirname(__FILE__)), 'noosfero-jessie-test.list')
-repo_url = 'http://download.noosfero.org/debian/jessie-test'
-needs_update = false
-
-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 '>>> Installing ruby-axlsx...'
-  system 'sudo apt-get update' if needs_update
-  unless system 'sudo apt-get install -y ruby-axlsx'
-    exit $?.exitstatus
-  end
-end
-
 system 'script/noosfero-plugins -q enable products delivery'
 exit $?.exitstatus


=====================================
plugins/orders/noosfero-jessie-test.list deleted
=====================================
--- a/plugins/orders/noosfero-jessie-test.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://download.noosfero.org/debian/jessie-test ./
-deb-src http://download.noosfero.org/debian/jessie-test ./



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/4e38b11976788f84cdb88243842a39d7a8331181...23073d5ec84d88b32c98cdb6d0b31385c1dffc33
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170313/4b6aa91b/attachment-0001.html>