You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/07 09:18:43 UTC

[13/14] git commit: Use awk to extract the version

Use awk to extract the version


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/60a7a6b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/60a7a6b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/60a7a6b3

Branch: refs/heads/master
Commit: 60a7a6b31a441f5f716091316f90819c62b22e70
Parents: b590adb
Author: Holden Karau <ho...@pigscanfly.ca>
Authored: Mon Jan 6 23:45:27 2014 -0800
Committer: Holden Karau <ho...@pigscanfly.ca>
Committed: Mon Jan 6 23:45:27 2014 -0800

----------------------------------------------------------------------
 project/build.properties | 3 ---
 sbt/sbt                  | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/60a7a6b3/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
index 03438f6..839f5fb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -14,7 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# Note: If you change the sbt version please also change the sbt download
-# script sbt/sbt
 sbt.version=0.12.4

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/60a7a6b3/sbt/sbt
----------------------------------------------------------------------
diff --git a/sbt/sbt b/sbt/sbt
index 2c19987..22672f2 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -2,7 +2,7 @@
 # This script launches sbt for this project. If present it uses the system 
 # version of sbt. If there is no system version of sbt it attempts to download
 # sbt locally.
-SBT_VERSION=0.12.4
+SBT_VERSION=`awk -F "=" '/sbt\\.version/ {print $2}' ./project/build.properties`
 URL1=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
 URL2=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
 JAR=sbt/sbt-launch-${SBT_VERSION}.jar