From 60f4d3b61d188dc3c6c75a47f4ee3e02f3e634cc Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Wed, 24 Feb 2016 20:42:13 +0100
Subject: [PATCH] Have the bootstrap command take into account the --classifier
 arguments

---
 .../scala-2.11/coursier/cli/Coursier.scala    |  2 +-
 .../main/scala-2.11/coursier/cli/Helper.scala | 38 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/cli/src/main/scala-2.11/coursier/cli/Coursier.scala b/cli/src/main/scala-2.11/coursier/cli/Coursier.scala
index 30143a5fa..cc4845190 100644
--- a/cli/src/main/scala-2.11/coursier/cli/Coursier.scala
+++ b/cli/src/main/scala-2.11/coursier/cli/Coursier.scala
@@ -475,7 +475,7 @@ case class Bootstrap(
       )
     else
       (
-        helper.res.artifacts.map(_.url),
+        helper.artifacts(sources = false, javadoc = false).map(_.url),
         Seq.empty[File]
       )
 
diff --git a/cli/src/main/scala-2.11/coursier/cli/Helper.scala b/cli/src/main/scala-2.11/coursier/cli/Helper.scala
index 5f33b6955..1d282edc3 100644
--- a/cli/src/main/scala-2.11/coursier/cli/Helper.scala
+++ b/cli/src/main/scala-2.11/coursier/cli/Helper.scala
@@ -283,11 +283,11 @@ class Helper(
       sys.exit(1)
   }
 
-  def fetch(
+  def artifacts(
     sources: Boolean,
     javadoc: Boolean,
     subset: Set[Dependency] = null
-  ): Seq[File] = {
+  ): Seq[Artifact] = {
 
     if (subset == null && verbose0 >= 0) {
       val msg = cachePolicies match {
@@ -302,17 +302,25 @@ class Helper(
 
     val res0 = Option(subset).fold(res)(res.subset)
 
-    val artifacts =
-      if (classifier0.nonEmpty || sources || javadoc) {
-        var classifiers = classifier0
-        if (sources)
-          classifiers = classifiers :+ "sources"
-        if (javadoc)
-          classifiers = classifiers :+ "javadoc"
+    if (classifier0.nonEmpty || sources || javadoc) {
+      var classifiers = classifier0
+      if (sources)
+        classifiers = classifiers :+ "sources"
+      if (javadoc)
+        classifiers = classifiers :+ "javadoc"
 
-        res0.classifiersArtifacts(classifiers.distinct)
-      } else
-        res0.artifacts
+      res0.classifiersArtifacts(classifiers.distinct)
+    } else
+      res0.artifacts
+  }
+
+  def fetch(
+    sources: Boolean,
+    javadoc: Boolean,
+    subset: Set[Dependency] = null
+  ): Seq[File] = {
+
+    val artifacts0 = artifacts(sources, javadoc, subset)
 
     val logger =
       if (verbose0 >= 0)
@@ -320,10 +328,10 @@ class Helper(
       else
         None
 
-    if (verbose0 >= 1 && artifacts.nonEmpty)
-      println(s"  Found ${artifacts.length} artifacts")
+    if (verbose0 >= 1 && artifacts0.nonEmpty)
+      println(s"  Found ${artifacts0.length} artifacts")
 
-    val tasks = artifacts.map(artifact =>
+    val tasks = artifacts0.map(artifact =>
       (Cache.file(artifact, caches, cachePolicies.head, checksums = checksums, logger = logger, pool = pool) /: cachePolicies.tail)(
         _ orElse Cache.file(artifact, caches, _, checksums = checksums, logger = logger, pool = pool)
       ).run.map(artifact.->)