Skip to content

Commit

Permalink
Merge remote-tracking branch 'alexrinass/systemwide'
Browse files Browse the repository at this point in the history
  • Loading branch information
sstephenson committed Sep 11, 2011
2 parents 6fa81ef + 5130f04 commit c6ce8fa
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions libexec/rbenv
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ abs_dirname() {
cd "$cwd"
}

rbenv_install_location=$(abs_dirname "$(dirname $0)")
export RBENV_HOME="${rbenv_install_location}"

libexec_path="$(abs_dirname "$0")"
export PATH="${libexec_path}:${PATH}"

Expand Down
4 changes: 2 additions & 2 deletions libexec/rbenv-global
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
set -e

RBENV_VERSION="$1"
RBENV_VERSION_FILE="${HOME}/.rbenv/global"
RBENV_VERSION_FILE="${RBENV_HOME}/global"

if [ -n "$RBENV_VERSION" ]; then
rbenv-version-file-write "$RBENV_VERSION_FILE" "$RBENV_VERSION"
else
rbenv-version-file-read "$RBENV_VERSION_FILE" ||
rbenv-version-file-read "${HOME}/.rbenv/default" ||
rbenv-version-file-read "${RBENV_HOME}/default" ||
echo system
fi
4 changes: 2 additions & 2 deletions libexec/rbenv-init
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ if [ -z "$print" ]; then
exit 1
fi

mkdir -p "${HOME}/.rbenv/"{shims,versions}
mkdir -p "${RBENV_HOME}/"{shims,versions}

echo 'export PATH="${HOME}/.rbenv/shims:${PATH}"'
echo 'export PATH="'${RBENV_HOME}'/shims:${PATH}"'

case "$shell" in
bash | zsh )
Expand Down
2 changes: 1 addition & 1 deletion libexec/rbenv-prefix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "$RBENV_VERSION" = "system" ]; then
exit
fi

RBENV_PREFIX_PATH="${HOME}/.rbenv/versions/${RBENV_VERSION}"
RBENV_PREFIX_PATH="${RBENV_HOME}/versions/${RBENV_VERSION}"
if [ ! -d "$RBENV_PREFIX_PATH" ]; then
echo "rbenv: version \`${RBENV_VERSION}' not installed" >&2
exit 1
Expand Down
4 changes: 2 additions & 2 deletions libexec/rbenv-rehash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

SHIM_PATH="${HOME}/.rbenv/shims"
SHIM_PATH="${RBENV_HOME}/shims"
PROTOTYPE_SHIM_PATH="${SHIM_PATH}/.rbenv-shim"

# Create the shims directory if it doesn't already exist.
Expand Down Expand Up @@ -63,7 +63,7 @@ shopt -s nullglob
make_shims ../versions/*/bin/*

# Find and run any plugins that might want to make shims too.
RBENV_REHASH_PLUGINS=(/etc/rbenv.d/rehash/*.bash ${HOME}/.rbenv/rbenv.d/rehash/*.bash)
RBENV_REHASH_PLUGINS=(/etc/rbenv.d/rehash/*.bash ${RBENV_HOME}/rbenv.d/rehash/*.bash)
shopt -u nullglob

for script in ${RBENV_REHASH_PLUGINS[@]}; do
Expand Down
4 changes: 2 additions & 2 deletions libexec/rbenv-version-file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ while [ -n "$root" ]; do
root="${root%/*}"
done

GLOBAL_PATH="${HOME}/.rbenv/global"
DEFAULT_PATH="${HOME}/.rbenv/default"
GLOBAL_PATH="${RBENV_HOME}/global"
DEFAULT_PATH="${RBENV_HOME}/default"

if [ -e "$GLOBAL_PATH" ]; then
echo "$GLOBAL_PATH"
Expand Down
2 changes: 1 addition & 1 deletion libexec/rbenv-version-name
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ -z "$RBENV_VERSION" ] || [ "$RBENV_VERSION" = "system" ]; then
exit
fi

RBENV_VERSION_PATH="${HOME}/.rbenv/versions/${RBENV_VERSION}"
RBENV_VERSION_PATH="${RBENV_HOME}/versions/${RBENV_VERSION}"

if [ -d "$RBENV_VERSION_PATH" ]; then
echo "$RBENV_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion libexec/rbenv-versions
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ else
print_version="$(rbenv-version)"
fi

for path in "${HOME}/.rbenv/versions/"*; do
for path in "${RBENV_HOME}/versions/"*; do
if [ -d "$path" ]; then
version="${path##*/}"

Expand Down
6 changes: 3 additions & 3 deletions libexec/rbenv-which
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ RBENV_VERSION="$(rbenv-version-name)"
RBENV_COMMAND="$1"

if [ "$RBENV_VERSION" = "system" ]; then
PATH="$(remove_from_path "${HOME}/.rbenv/shims")"
PATH="$(remove_from_path "${RBENV_HOME}/shims")"
RBENV_COMMAND_PATH="$(command -v "$RBENV_COMMAND")"
else
RBENV_COMMAND_PATH="${HOME}/.rbenv/versions/${RBENV_VERSION}/bin/${RBENV_COMMAND}"
RBENV_COMMAND_PATH="${RBENV_HOME}/versions/${RBENV_VERSION}/bin/${RBENV_COMMAND}"
fi

shopt -s nullglob
RBENV_WHICH_PLUGINS=(/etc/rbenv.d/which/*.bash ${HOME}/.rbenv/rbenv.d/which/*.bash)
RBENV_WHICH_PLUGINS=(/etc/rbenv.d/which/*.bash ${RBENV_HOME}/rbenv.d/which/*.bash)
shopt -u nullglob

for script in ${RBENV_WHICH_PLUGINS[@]}; do
Expand Down

0 comments on commit c6ce8fa

Please sign in to comment.