github-mirrors/odc-analyzer
1
0
Fork 0
mirror of https://github.com/ysoftdevs/odc-analyzer.git synced 2026-03-25 18:42:07 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

Added config option for NuGet -source

Browse Source
This commit is contained in:
Šesták Vít
2017-08-01 16:04:19 +02:00
parent 22e4cff12b
commit 9a93099f60
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/OdcService.scala
View File

@@ -21,7 +21,7 @@ import scala.concurrent.{ExecutionContext, Future}
case class OdcDbConnectionConfig(driverClass: String, driverJar: String, url: String, user: String, password: String)
case class OdcConfig(odcPath: String, extraArgs: Seq[String] = Seq(), workingDirectory: String = ".", propertyFile: Option[String], cleanTmpDir: Boolean = true)
case class OdcConfig(odcPath: String, extraArgs: Seq[String] = Seq(), workingDirectory: String = ".", propertyFile: Option[String], cleanTmpDir: Boolean = true, dotNetNugetSource: Option[String])
case class SingleLibraryScanResult(mainDependencies: Seq[GroupedDependency], transitiveDependencies: Seq[GroupedDependency], includesTransitive: Boolean, limitationsOption: Option[String])
@@ -95,13 +95,14 @@ class OdcService @Inject() (odcConfig: OdcConfig, odcDbConnectionConfig: OdcDbCo
val packagesConfigFile = dir.resolve("..").resolve("packages.config")
Files.write(packagesConfigFile, packagesConfig.toString().getBytes(UTF_8))
import sys.process._
Seq(
val cmd = Seq(
nugetBin,
"restore",
packagesConfigFile.toString,
"-PackagesDirectory",
dir.toString
).!!
) ++ odcConfig.dotNetNugetSource.fold(Seq[String]())(source => Seq("-source", source))
cmd.!!
}
private def consumeStream(in: InputStream): Array[Byte] = {