[DRE-commits] [SCM] rbenv.git branch, master, updated. debian/0.1.2+git20100922-1-15-ga004426

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit f5ace361e9f4fa45784b6ddb15791f0dfd437c37
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 10 13:48:10 2012 -0200

    Export patch

diff --git a/debian/patches/0001-Add-system-plugins-dir.patch b/debian/patches/0001-Add-system-plugins-dir.patch
new file mode 100644
index 0000000..893204a
--- /dev/null
+++ b/debian/patches/0001-Add-system-plugins-dir.patch
@@ -0,0 +1,35 @@
+From 4138f988358ae756d565886ed80128b62ecc4c9f Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Tue, 10 Jan 2012 13:46:42 -0200
+Subject: [PATCH] Add system plugins dir
+
+---
+ libexec/rbenv |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libexec/rbenv b/libexec/rbenv
+index 5fe8433..838b856 100755
+--- a/libexec/rbenv
++++ b/libexec/rbenv
+@@ -42,14 +42,16 @@ export RBENV_DIR
+ 
+ shopt -s nullglob
+ 
++system_plugins_dir=/usr/lib/rbenv/plugins
++
+ bin_path="$(abs_dirname "$0")"
+-for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do
++for plugin_bin in "${system_plugins_dir}/"*/bin "${RBENV_ROOT}/plugins/"*/bin; do
+   bin_path="${bin_path}:${plugin_bin}"
+ done
+ export PATH="${bin_path}:${PATH}"
+ 
+ hook_path="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d"
+-for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
++for plugin_hook in "${system_plugins_dir}/"*/etc/rbenv.d "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
+   hook_path="${hook_path}:${plugin_hook}"
+ done
+ export RBENV_HOOK_PATH="$hook_path"
+-- 
+1.7.8.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bf36a7f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-system-plugins-dir.patch

-- 
rbenv.git