Merge branch 'master' into cp-shim

Conflicts:
	bin/rbenv-shim

bin/rbenv

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

bin/rbenv-exec

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

bin/rbenv-path

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

bin/rbenv-rehash

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 mkdir -p "${HOME}/.rbenv/shims"
 cd "${HOME}/.rbenv/shims"

bin/rbenv-set-default

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

bin/rbenv-set-local

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

bin/rbenv-version

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

bin/rbenv-versions

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

bin/rbenv-which

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