From 06228d3583e24b5057516f357f7d0ae802153007 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 2 Aug 2011 18:50:44 -0500
Subject: [PATCH 1/3] Copies bins into shims/ instead of symlinking

Fixes #6
---
 bin/rbenv-rehash | 7 ++++++-
 bin/rbenv-shim   | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100755 bin/rbenv-shim

diff --git a/bin/rbenv-rehash b/bin/rbenv-rehash
index 8bbd53b6..7344a687 100755
--- a/bin/rbenv-rehash
+++ b/bin/rbenv-rehash
@@ -5,5 +5,10 @@ cd "${HOME}/.rbenv/shims"
 rm -f *
 
 for file in ../versions/*/bin/*; do
-  ln -fs ../bin/rbenv-shim "${file##*/}"
+  shim="${file##*/}"
+  cat > "$shim" <<SH
+#!/bin/sh
+exec rbenv exec ${file##*/} \$@
+SH
+  chmod +x "$shim"
 done
diff --git a/bin/rbenv-shim b/bin/rbenv-shim
deleted file mode 100755
index 0acca18f..00000000
--- a/bin/rbenv-shim
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-exec rbenv-exec "${0##*/}" "$@"

From ce8d3278a49ef35ba36a8fb6a7fbd492e9dadd1e Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 2 Aug 2011 18:55:14 -0500
Subject: [PATCH 2/3] Use $shim var

---
 bin/rbenv-rehash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/rbenv-rehash b/bin/rbenv-rehash
index 7344a687..7f1e9918 100755
--- a/bin/rbenv-rehash
+++ b/bin/rbenv-rehash
@@ -8,7 +8,7 @@ for file in ../versions/*/bin/*; do
   shim="${file##*/}"
   cat > "$shim" <<SH
 #!/bin/sh
-exec rbenv exec ${file##*/} \$@
+exec rbenv exec $shim \$@
 SH
   chmod +x "$shim"
 done

From 6df306d8f88b8f3c23851bb571d136c23e89945e Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 2 Aug 2011 19:37:18 -0500
Subject: [PATCH 3/3] Quote `$@`

---
 bin/rbenv-rehash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 bin/rbenv-rehash

diff --git a/bin/rbenv-rehash b/bin/rbenv-rehash
old mode 100755
new mode 100644
index 7f1e9918..1d42bce9
--- a/bin/rbenv-rehash
+++ b/bin/rbenv-rehash
@@ -8,7 +8,7 @@ for file in ../versions/*/bin/*; do
   shim="${file##*/}"
   cat > "$shim" <<SH
 #!/bin/sh
-exec rbenv exec $shim \$@
+exec rbenv exec $shim "\$@"
 SH
   chmod +x "$shim"
 done