cleanup: whitespace changes, separated more things into their own files, use ++ for strings everywhere. Added ++ method to File and URL and use it in many places

1 files changed, 11 insertions, 11 deletions

diff --git a/stage1/paths.scala b/stage1/paths.scala
index f76c2f7..d3856c8 100644
--- a/stage1/paths.scala
+++ b/stage1/paths.scala
@@ -1,15 +1,15 @@
 package cbt
 import java.io._
 object paths{  
-  val cbtHome = new File(Option(System.getenv("CBT_HOME")).get)
-  val mavenCache = new File(cbtHome+"/cache/maven/")
-  val userHome = new File(Option(System.getProperty("user.home")).get)
-  val stage1 = new File(Option(System.getenv("STAGE1")).get)
-  val stage2 = new File(cbtHome + "/stage2/")
-  val nailgun = new File(Option(System.getenv("NAILGUN")).get)
-  private val target = Option(System.getenv("TARGET")).get
-  val stage1Target = new File(stage1 + "/" + target)
-  val stage2Target = new File(stage2 + "/" + target)
-  val nailgunTarget = new File(nailgun + "/" + target)
-  val sonatypeLogin = new File(cbtHome+"/sonatype.login")
+  val cbtHome: File = new File(Option(System.getenv("CBT_HOME")).get)
+  val mavenCache: File = cbtHome ++ "/cache/maven"
+  val userHome: File = new File(Option(System.getProperty("user.home")).get)
+  val stage1: File = new File(Option(System.getenv("STAGE1")).get)
+  val stage2: File = cbtHome ++ "/stage2"
+  val nailgun: File = new File(Option(System.getenv("NAILGUN")).get)
+  private val target = Option(System.getenv("TARGET")).get.stripSuffix("/")
+  val stage1Target: File = stage1 ++ ("/" ++ target)
+  val stage2Target: File = stage2 ++ ("/" ++ target)
+  val nailgunTarget: File = nailgun ++ ("/" ++ target)
+  val sonatypeLogin: File = cbtHome ++ "/sonatype.login"
 }