Download as
Browse Code »

Commit a231b1b932814d597d9df5752abd23cf22d4ce0d

Authored by Antonio Terceiro
1 parent 36b6acfc
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Support both Debian stable and unstable/testing

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
config/boot.rb
  Diff comments   View file @a231b1b
@@ -108,7 +108,7 @@ end @@ -108,7 +108,7 @@ end
108 # yeah, I know, I shouldn't change this file. But ... 108 # yeah, I know, I shouldn't change this file. But ...
109 def install_debian_rails 109 def install_debian_rails
110 local_rails = File.dirname(__FILE__) + '/../vendor/rails' 110 local_rails = File.dirname(__FILE__) + '/../vendor/rails'
111 - debian_rails = '/usr/share/rails-ruby1.8' 111 + debian_rails = ['/usr/share/rails-ruby1.8', '/usr/lib/ruby/vendor_ruby/rails'].find { |d| File.exists?(d) }
112 if !File.exist?(local_rails) && File.exists?(debian_rails) 112 if !File.exist?(local_rails) && File.exists?(debian_rails)
113 puts "I: Installing Debian-installed Rails from /usr/share/rails into vendor/rails." 113 puts "I: Installing Debian-installed Rails from /usr/share/rails into vendor/rails."
114 recommended_rails_version = Rails::GemBoot.gem_version 114 recommended_rails_version = Rails::GemBoot.gem_version