Merge remote branch 'fork/16'

caarlos0-graveyard · Feb 21, 2015 · a86796f · a86796f
2 parents 181437f + 096b586
commit a86796f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ If you don't have and don't want to have this in your project's pom,
 you can also do this:
 
 ```sh
-echo 7 > .java-version
+jvm local 7
 ```
 
 On OSX, jvm will use the `java_home` tool to find the available versions. For

diff --git a/jvm.sh b/jvm.sh
@@ -29,6 +29,21 @@ _jvm-discover-and-set() {
  [ ! -z "$version" ] && _jvm_set-java-path "$version"
 }
 
+jvm() {
+ if [ "$#" != 0 ]; then
+ local command="$1"; shift
+ fi
+ case "$command" in
+ local)
+ echo "$@" > .java-version
+ ;;
+ *)
+ echo "Usage: jvm (local) <args>"
+ return 0
+ ;;
+ esac
+}
+
 if [ ! -z "$BASH" ]; then
  PROMPT_COMMAND=_jvm-discover-and-set
 elif [ ! -z "$ZSH_NAME" ]; then