From 5a4bee6eb51a7ddc99d22d76dab88b125fe2c1ea Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 23 Aug 2011 11:34:03 -0500
Subject: [PATCH 1/3] List sh commands separately

---
 libexec/rbenv-commands | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/libexec/rbenv-commands b/libexec/rbenv-commands
index 43846ce4..08c5a944 100755
--- a/libexec/rbenv-commands
+++ b/libexec/rbenv-commands
@@ -1,11 +1,25 @@
 #!/usr/bin/env bash
 set -e
 
+if [ "$1" = "--sh" ]; then
+  sh=1
+  shift
+fi
+
 shopt -s nullglob
 
 { for path in ${PATH//:/$'\n'}; do
     for command in "${path}/rbenv-"*; do
-      echo "${command##*rbenv-}"
+      command="${command##*rbenv-}"
+      if [ -n "$sh" ]; then
+        if [ ${command:0:3} = "sh-" ]; then
+          echo ${command##sh-}
+        fi
+      else
+        if [ ${command:0:3} != "sh-" ]; then
+          echo $command
+        fi
+      fi
     done
   done
 } | sort | uniq

From f9225d9cb445cfb24daac4258e1328c0262e3184 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 23 Aug 2011 11:34:42 -0500
Subject: [PATCH 2/3] Define lightweight rbenv shell function to dispatch
 commands

---
 libexec/rbenv-init | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index 3e670372..29daa10c 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -66,3 +66,18 @@ bash | zsh )
 esac
 
 echo 'rbenv rehash 2>/dev/null'
+
+commands=(`rbenv commands --sh`)
+IFS="|"
+cat <<EOS
+function rbenv () {
+  command=\$1;
+  shift;
+  case \$command in
+  ${commands[*]})
+    eval \`rbenv sh-\$command \$@\`;;
+  *)
+    command rbenv \$command \$@;;
+  esac;
+};
+EOS

From bff38d7e71109d51f8fbca3662a4058a8dca6039 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 23 Aug 2011 11:35:06 -0500
Subject: [PATCH 3/3] use command

---
 libexec/rbenv-sh-use | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 libexec/rbenv-sh-use

diff --git a/libexec/rbenv-sh-use b/libexec/rbenv-sh-use
new file mode 100755
index 00000000..187ed6ac
--- /dev/null
+++ b/libexec/rbenv-sh-use
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "export RBENV_VERSION=$1"