Merge branch 'master' into libexec

Conflicts:
	bin/rbenv
	libexec/rbenv-shim

libexec/rbenv

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 abs_dirname() {
   orig_dir=`pwd`

libexec/rbenv-exec

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_COMMAND="$1"
 if [ -z "$RBENV_COMMAND" ]; then

libexec/rbenv-path

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 if [ -n "$1" ]; then
   RBENV_VERSION="$1"

libexec/rbenv-rehash

@@ -1,9 +1,14 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 mkdir -p "${HOME}/.rbenv/shims"
 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 $shim "\$@"
+SH
+  chmod +x "$shim"
 done

libexec/rbenv-set-default

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then

libexec/rbenv-set-local

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then

libexec/rbenv-shim

@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-exec rbenv-exec "${0##*/}" "$@"

libexec/rbenv-version

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 read_version_file() {
   egrep -m 1 '[^[:space:]]' "$1"

libexec/rbenv-versions

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$(rbenv-version)"
 

libexec/rbenv-which

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$(rbenv-version)"
 RBENV_COMMAND="$1"