File 0003-use-shared-path-for-shared-resources.patch of Package rubygem-passenger

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-use-shared-path-for-shared-resources.patch of Package rubygem-passenger (Revision 35af34d27d595931f003a7d5db6dc178)

Currently displaying revision 35af34d27d595931f003a7d5db6dc178 , Show latest

From 2c946054035c20c290f6ed1e8158af1fb527ba03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
Date: Wed, 30 Sep 2015 17:47:27 +0200
Subject: [PATCH 3/4] use shared path for shared resources

---
 src/ruby_supportlib/phusion_passenger.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ruby_supportlib/phusion_passenger.rb b/src/ruby_supportlib/phusion_passenger.rb
index 832ad65..079c258 100644
--- a/src/ruby_supportlib/phusion_passenger.rb
+++ b/src/ruby_supportlib/phusion_passenger.rb
@@ -110,18 +110,20 @@ module PhusionPassenger
         instance_variable_set("@#{field}", value)
       end
     else
+      require 'rbconfig'
+      shared_basedir         = File.join(RbConfig::CONFIG['libdir'], 'passenger', VERSION_STRING)
       source_root            = File.dirname(File.dirname(File.dirname(FILE_LOCATION)))
       @install_spec          = source_root
       @custom_packaged       = false
-      @bin_dir               = "#{source_root}/bin".freeze
+      @bin_dir               = "#{shared_basedir}/bin".freeze
       @support_binaries_dir  = "#{source_root}/buildout/support-binaries".freeze
       @lib_dir               = "#{source_root}/buildout".freeze
-      @helper_scripts_dir    = "#{source_root}/src/helper-scripts".freeze
-      @resources_dir         = "#{source_root}/resources".freeze
+      @helper_scripts_dir    = "#{shared_basedir}/src/helper-scripts".freeze
+      @resources_dir         = "#{shared_basedir}/resources".freeze
       @include_dir           = "#{source_root}/src".freeze
       @doc_dir               = "#{source_root}/doc".freeze
       @ruby_libdir           = File.dirname(FILE_LOCATION).freeze
-      @node_libdir           = "#{source_root}/src/nodejs_supportlib".freeze
+      @node_libdir           = "#{shared_basedir}/src/nodejs_supportlib".freeze
       @apache2_module_path   = "#{source_root}/buildout/apache2/mod_passenger.so".freeze
       @ruby_extension_source_dir = "#{source_root}/src/ruby_native_extension".freeze
       @nginx_module_source_dir   = "#{source_root}/src/nginx_module".freeze
-- 
2.1.4

Places

File 0003-use-shared-path-for-shared-resources.patch of Package rubygem-passenger (Revision 35af34d27d595931f003a7d5db6dc178)

Places