From 0b372a04a962ef9c911b262fac51b723b6107f7f Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 11 Jul 2013 10:51:28 +0200 Subject: remove space in os names --- project/Build.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'project') diff --git a/project/Build.scala b/project/Build.scala index a60b60e..8b84c5b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -33,7 +33,7 @@ object FlowBuild extends Build { Dependencies.ioFile), compileOrder in Compile := CompileOrder.Mixed, resourceGenerators in Compile <+= (resourceManaged in Compile, binariesDirectory in ThisBuild) map { (resDir, binDir) => - val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) +val binaries: Seq[(File, File)] = getLatestBinaries(binDir, BinaryMajorVersion) val resources = for (binary <- binaries) yield { val versionedBinary = binary._1 val unversionedBinary = binary._2 @@ -62,7 +62,7 @@ object FlowBuild extends Build { } } - val oSs = base.listFiles + val oSs = IO.listFiles(base).filter(file => !file.name.startsWith(".")) val platforms = oSs.flatMap(_.listFiles) platforms.flatMap(latest(_)) @@ -85,7 +85,7 @@ object FlowBuild extends Build { ) def canonicalBinaryPath(base: File, binaryName: String) = { - base / sys.props("os.name").toLowerCase / sys.props("os.arch").toLowerCase / binaryName + base / sys.props("os.name").toLowerCase.filter(_ != ' ') / sys.props("os.arch").toLowerCase / binaryName } val publishNative = taskKey[File]("Publish native binary compiled on current OS to flow-binaries project so that it may be packaged in a distribution of flow.") val publishNativeImpl = Def.task{ -- cgit v1.2.3