Merge remote branch 'fork/19'

caarlos0-graveyard · Feb 21, 2015 · af399b2 · af399b2
2 parents a86796f + e0e3f12
commit af399b2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/jvm.sh b/jvm.sh
@@ -26,6 +26,9 @@ _jvm-discover-and-set() {
  if [ -z "$version" ] && [ -f .java-version ]; then
  local version="$(cat .java-version)"
  fi
+ if [ -z "$version" ] && [ -f ~/.java-version ]; then
+ local version="$(cat ~/.java-version)"
+ fi
  [ ! -z "$version" ] && _jvm_set-java-path "$version"
 }
 
@@ -36,9 +39,14 @@ jvm() {
  case "$command" in
  local)
  echo "$@" > .java-version
+ _jvm-discover-and-set
+ ;;
+ global)
+ echo "$@" > ~/.java-version
+ _jvm-discover-and-set
  ;;
  *)
- echo "Usage: jvm (local) <args>"
+ echo "Usage: jvm (local|global) <args>"
  return 0
  ;;
  esac