diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-07 01:36:40 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-07 01:36:40 -0500 |
commit | e958dec0dbbcf7f7a28cd21641e76390fb3dba6a (patch) | |
tree | ec0933e230b0c3f222fceb82b3eec177d56ea979 /stage1/paths.scala | |
parent | f0dc760df8757caea1d83b15142a3d0704488636 (diff) | |
download | cbt-e958dec0dbbcf7f7a28cd21641e76390fb3dba6a.tar.gz cbt-e958dec0dbbcf7f7a28cd21641e76390fb3dba6a.tar.bz2 cbt-e958dec0dbbcf7f7a28cd21641e76390fb3dba6a.zip |
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
Diffstat (limited to 'stage1/paths.scala')
-rw-r--r-- | stage1/paths.scala | 22 |
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" } |