From 07517da2fa831d28999f1ec1154a3229b0c05336 Mon Sep 17 00:00:00 2001 From: Gildas Cuisinier Date: Sat, 2 Feb 2013 15:50:50 +0100 Subject: [PATCH] replace ruby reference with java --- libexec/jenv-prefix | 6 +++--- libexec/jenv-rehash | 2 +- libexec/jenv-version-name | 6 +++--- libexec/jenv-versions | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libexec/jenv-prefix b/libexec/jenv-prefix index 37e6a68..4b0ac95 100755 --- a/libexec/jenv-prefix +++ b/libexec/jenv-prefix @@ -22,9 +22,9 @@ elif [ -z "$JENV_VERSION" ]; then fi if [ "$JENV_VERSION" = "system" ]; then - RUBY_PATH="$(jenv-which ruby)" - RUBY_PATH="${RUBY_PATH%/*}" - echo "${RUBY_PATH%/bin}" + JAVA_PATH="$(jenv-which java)" + JAVA_PATH="${JAVA_PATH%/*}" + echo "${JAVA_PATH%/bin}" exit fi diff --git a/libexec/jenv-rehash b/libexec/jenv-rehash index 8ba734f..f1beb31 100755 --- a/libexec/jenv-rehash +++ b/libexec/jenv-rehash @@ -78,7 +78,7 @@ set -e [ -n "\$JENV_DEBUG" ] && set -x program="\${0##*/}" -if [ "\$program" = "ruby" ]; then +if [ "\$program" = "java" ]; then for arg; do case "\$arg" in -e* | -- ) break ;; diff --git a/libexec/jenv-version-name b/libexec/jenv-version-name index d3d24fb..6b74e52 100755 --- a/libexec/jenv-version-name +++ b/libexec/jenv-version-name @@ -20,11 +20,11 @@ version_exists() { if version_exists "$JENV_VERSION"; then echo "$JENV_VERSION" -elif version_exists "${JENV_VERSION#ruby-}"; then - { echo "warning: ignoring extraneous \`ruby-' prefix in version \`${JENV_VERSION}'" +elif version_exists "${JENV_VERSION#java-}"; then + { echo "warning: ignoring extraneous \`java-' prefix in version \`${JENV_VERSION}'" echo " (set by $(jenv-version-origin))" } >&2 - echo "${JENV_VERSION#ruby-}" + echo "${JENV_VERSION#java-}" else echo "jenv: version \`$JENV_VERSION' is not installed" >&2 exit 1 diff --git a/libexec/jenv-versions b/libexec/jenv-versions index f3d4ffc..9a260b7 100755 --- a/libexec/jenv-versions +++ b/libexec/jenv-versions @@ -28,7 +28,7 @@ print_version() { } # Include "system" in the non-bare output, if it exists -if [ -n "$include_system" ] && JENV_VERSION=system jenv-which ruby >/dev/null 2>&1; then +if [ -n "$include_system" ] && JENV_VERSION=system jenv-which java >/dev/null 2>&1; then print_version system fi