Github user brennonyork commented on a diff in the pull request:

    https://github.com/apache/spark/pull/3707#discussion_r22289411
  
    --- Diff: sbt/sbt ---
    @@ -1,111 +1,9 @@
    -#!/usr/bin/env bash
    +#!/bin/bash
     
    -# When creating new tests for Spark SQL Hive, the HADOOP_CLASSPATH must 
contain the hive jars so
    -# that we can run Hive to generate the golden answer.  This is not 
required for normal development
    -# or testing.
    -for i in "$HIVE_HOME"/lib/*
    -do HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$i"
    -done
    -export HADOOP_CLASSPATH
    +# Determine the current working directory
    +_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
     
    -realpath () {
    -(
    -  TARGET_FILE="$1"
    +echo "WARNING: The sbt/sbt script has been deprecated in place of 
build/sbt." >&2
    +echo "         Please change all references to point to the new location." 
>&2
     
    -  cd "$(dirname "$TARGET_FILE")"
    -  TARGET_FILE="$(basename "$TARGET_FILE")"
    -
    -  COUNT=0
    -  while [ -L "$TARGET_FILE" -a $COUNT -lt 100 ]
    -  do
    -      TARGET_FILE="$(readlink "$TARGET_FILE")"
    -      cd $(dirname "$TARGET_FILE")
    -      TARGET_FILE="$(basename $TARGET_FILE)"
    -      COUNT=$(($COUNT + 1))
    -  done
    -
    -  echo "$(pwd -P)/"$TARGET_FILE""
    -)
    -}
    -
    -. "$(dirname "$(realpath "$0")")"/sbt-launch-lib.bash
    -
    -
    -declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot 
-Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
    -declare -r sbt_opts_file=".sbtopts"
    -declare -r etc_sbt_opts_file="/etc/sbt/sbtopts"
    -
    -usage() {
    - cat <<EOM
    -Usage: $script_name [options]
    -
    -  -h | -help         print this message
    -  -v | -verbose      this runner is chattier
    -  -d | -debug        set sbt log level to debug
    -  -no-colors         disable ANSI color codes
    -  -sbt-create        start sbt even if current directory contains no sbt 
project
    -  -sbt-dir   <path>  path to global settings/plugins directory (default: 
~/.sbt)
    -  -sbt-boot  <path>  path to shared boot directory (default: ~/.sbt/boot 
in 0.11 series)
    -  -ivy       <path>  path to local Ivy repository (default: ~/.ivy2)
    -  -mem    <integer>  set memory options (default: $sbt_mem, which is 
$(get_mem_opts $sbt_mem))
    -  -no-share          use all local caches; no sharing
    -  -no-global         uses global caches, but does not use global ~/.sbt 
directory.
    -  -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
    -  -sbt-jar      <path>      use the specified jar as the sbt launcher
    -  -sbt-rc                   use an RC version of sbt
    -  -sbt-snapshot             use a snapshot version of sbt
    -
    -  # java version (default: java from PATH, currently $(java -version 2>&1 
| grep version))
    -  -java-home <path>         alternate JAVA_HOME
    -
    -  # jvm options and output control
    -  JAVA_OPTS          environment variable, if unset uses "$java_opts"
    -  SBT_OPTS           environment variable, if unset uses 
"$default_sbt_opts"
    -  .sbtopts           if this file exists in the current directory, it is
    -                     prepended to the runner args
    -  /etc/sbt/sbtopts   if this file exists, it is prepended to the runner 
args
    -  -Dkey=val          pass -Dkey=val directly to the java runtime
    -  -J-X               pass option -X directly to the java runtime
    -                     (-J is stripped)
    -  -S-X               add -X to sbt's scalacOptions (-S is stripped)
    -  -PmavenProfiles    Enable a maven profile for the build.
    -
    -In the case of duplicated or conflicting options, the order above
    -shows precedence: JAVA_OPTS lowest, command line options highest.
    -EOM
    -}
    -
    -process_my_args () {
    -  while [[ $# -gt 0 ]]; do
    -    case "$1" in
    -     -no-colors) addJava "-Dsbt.log.noformat=true" && shift ;;
    -      -no-share) addJava "$noshare_opts" && shift ;;
    -     -no-global) addJava "-Dsbt.global.base=$(pwd)/project/.sbtboot" && 
shift ;;
    -      -sbt-boot) require_arg path "$1" "$2" && addJava 
"-Dsbt.boot.directory=$2" && shift 2 ;;
    -       -sbt-dir) require_arg path "$1" "$2" && addJava 
"-Dsbt.global.base=$2" && shift 2 ;;
    -     -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;;
    -         -batch) exec </dev/null && shift ;;
    -
    -    -sbt-create) sbt_create=true && shift ;;
    -
    -              *) addResidual "$1" && shift ;;
    -    esac
    -  done
    -
    -  # Now, ensure sbt version is used.
    -  [[ "${sbt_version}XXX" != "XXX" ]] && addJava 
"-Dsbt.version=$sbt_version"
    -}
    -
    -loadConfigFile() {
    -  cat "$1" | sed '/^\#/d'
    -}
    -
    -# if sbtopts files exist, prepend their contents to $@ so it can be 
processed by this runner
    -[[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile 
"$etc_sbt_opts_file") "$@"
    -[[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@"
    -
    -run "$@"
    +${_DIR}/../build/sbt $@
    --- End diff --
    
    Yes it does, great catch! I'll be back to a computer in a few hours and can 
commit the changes, but, if you want to merge before that, feel free to update. 
Thanks!
    
    
    
    -----Original Message-----
    From: Patrick Wendell 
[[email protected]<mailto:[email protected]>]
    Sent: Friday, December 26, 2014 04:13 PM Eastern Standard Time
    To: apache/spark
    Cc: York, Brennon
    Subject: Re: [spark] [SPARK-4501][Core] - Create build/mvn to automatically 
download maven/zinc/scalac (#3707)
    
    
    In 
sbt/sbt<https://github.com/apache/spark/pull/3707#discussion-diff-22288516>:
    
    
    > -  done
    > -
    > -  # Now, ensure sbt version is used.
    > -  [[ "${sbt_version}XXX" != "XXX" ]] && addJava 
"-Dsbt.version=$sbt_version"
    > -}
    > -
    > -loadConfigFile() {
    > -  cat "$1" | sed '/^\#/d'
    > -}
    > -
    > -# if sbtopts files exist, prepend their contents to $@ so it can be 
processed by this runner
    > -[[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile 
"$etc_sbt_opts_file") "$@"
    > -[[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") 
"$@"
    > -
    > -run "$@"
    > +${_DIR}/../build/sbt $@
    
    
    Does this need to quote the "$@" to preserve argument arrays?
    
    —
    Reply to this email directly or view it on 
GitHub<https://github.com/apache/spark/pull/3707/files#r22288516>.
    ________________________________________________________
    
    The information contained in this e-mail is confidential and/or proprietary 
to Capital One and/or its affiliates. The information transmitted herewith is 
intended only for use by the individual or entity to which it is addressed.  If 
the reader of this message is not the intended recipient, you are hereby 
notified that any review, retransmission, dissemination, distribution, copying 
or other use of, or taking of any action in reliance upon this information is 
strictly prohibited. If you have received this communication in error, please 
contact the sender and delete the material from your computer.



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to