aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2013-07-11 10:51:28 +0200
committerJakob Odersky <jodersky@gmail.com>2013-07-11 10:51:28 +0200
commit0b372a04a962ef9c911b262fac51b723b6107f7f (patch)
tree35ba3ae8d3b87b0ae50604253433dab6bdddbc87
parentfa9ab8933f1452cc43724b5067d78b55d1969ceb (diff)
downloadakka-serial-0b372a04a962ef9c911b262fac51b723b6107f7f.tar.gz
akka-serial-0b372a04a962ef9c911b262fac51b723b6107f7f.tar.bz2
akka-serial-0b372a04a962ef9c911b262fac51b723b6107f7f.zip
remove space in os names
-rw-r--r--flow-main/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala2
-rw-r--r--project/Build.scala6
2 files changed, 4 insertions, 4 deletions
diff --git a/flow-main/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala b/flow-main/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala
index 23314f1..41ae250 100644
--- a/flow-main/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala
+++ b/flow-main/src/main/scala/com/github/jodersky/flow/internal/NativeLoader.scala
@@ -10,7 +10,7 @@ import scala.util.Try
object NativeLoader {
def extract(): Option[File] = {
- val os = System.getProperty("os.name").toLowerCase
+ val os = System.getProperty("os.name").toLowerCase.filter(_ != ' ')
val arch = System.getProperty("os.arch").toLowerCase
val fqlib = System.mapLibraryName("flow") //fully qualified library name
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{