Merge branch 'master' of https://github.com/paulp/sbt-extras into full-packaging

sbt

@@ -113,7 +113,7 @@ execRunner () {
     echo ""
   }
 
-  "$@"
+  exec "$@"
 }
 
 echoerr () {
@@ -234,6 +234,7 @@ Usage: $script_name [options]
   -no-share          use all local caches; no sharing
   -offline           put sbt in offline mode
   -jvm-debug <port>  Turn on JVM debugging, open at the given port.
+  -batch             Disable interactive mode
 
   # sbt version (default: from project/build.properties if present, else latest release)
   -sbt-version  <version>   use the specified version of sbt
@@ -318,6 +319,7 @@ process_args ()
      -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;;
        -offline) addSbt "set offline := true" && shift ;;
      -jvm-debug) require_arg port "$1" "$2" && addDebugger $2 && shift 2 ;;
+         -batch) exec </dev/null && shift ;;
 
     -sbt-create) sbt_create=true && shift ;;
         -sbt-rc) [[ -n "$sbt_rc_version" ]] || die "no sbt RC candidate defined."; sbt_version=$sbt_rc_version && shift ;;