Merge branch 'master' into libexec

Conflicts:
	bin/rbenv
	libexec/rbenv-shim
This commit is contained in:
Joshua Peek 2011-08-02 19:41:03 -05:00
commit d65141c7b5
10 changed files with 15 additions and 13 deletions

View file

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

View file

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

View file

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

9
libexec/rbenv-rehash Executable file → Normal file
View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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