Skip to content

Commit bca44c9

Browse files
committed
Scalafmt and fixes after review
1 parent 5ae152c commit bca44c9

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

modules/cli/src/main/scala/scala/cli/commands/InstallHome.scala

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,21 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
1515
Version(newVersion) > Version(oldVersion)
1616
}
1717

18-
private def loggingEqual(version: String) = {
18+
private def logEqual(version: String) = {
1919
System.err.println(
2020
s"Scala-cli $version is already installed and up-to-date."
2121
)
2222
sys.exit(0)
2323
}
2424

25-
private def loggingUpdate(env: Boolean, newVersion: String, oldVersion: String) = {
25+
private def logUpdate(env: Boolean, newVersion: String, oldVersion: String) =
2626
if (!env) println(
2727
s"""scala-cli $oldVersion is already installed and out-of-date.
2828
|scala-cli will be updated to version $newVersion
2929
|""".stripMargin
3030
)
31-
}
3231

33-
private def loggingDowngrade(env: Boolean, newVersion: String, oldVersion: String) = {
32+
private def logDowngrade(env: Boolean, newVersion: String, oldVersion: String) =
3433
if (!env && coursier.paths.Util.useAnsiOutput()) {
3534
println(s"scala-cli $oldVersion is already installed and up-to-date.")
3635
println(s"Do you want to downgrade scala-cli to version $newVersion [Y/n]")
@@ -46,7 +45,6 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
4645
)
4746
sys.exit(1)
4847
}
49-
}
5048

5149
def run(options: InstallHomeOptions, args: RemainingArgs): Unit = {
5250

@@ -62,13 +60,12 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
6260
os.proc(binDirPath / options.binaryName, "version").call(cwd = os.pwd).out.text.trim
6361
}.toOption.getOrElse("0.0.0")
6462

65-
if (os.exists(binDirPath)) {
63+
if (os.exists(binDirPath))
6664
if (options.force) () // skip logging
67-
else if (newVersion == oldVersion) loggingEqual(newVersion)
65+
else if (newVersion == oldVersion) logEqual(newVersion)
6866
else if (isOutOfDate(newVersion, oldVersion))
69-
loggingUpdate(options.env, newVersion, oldVersion)
70-
else loggingDowngrade(options.env, newVersion, oldVersion)
71-
}
67+
logUpdate(options.env, newVersion, oldVersion)
68+
else logDowngrade(options.env, newVersion, oldVersion)
7269

7370
os.remove.all(binDirPath)
7471

@@ -80,9 +77,8 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
8077
if (!Properties.isWin)
8178
os.perms.set(binDirPath / options.binaryName, os.PermSet.fromString("rwxr-xr-x"))
8279

83-
if (options.env) {
84-
println(s""" export PATH="$$PATH:$binDirPath" """)
85-
}
80+
if (options.env)
81+
println(s"""export PATH="$binDirPath:$$PATH"""")
8682
else {
8783

8884
val update = EnvironmentUpdate(Nil, Seq("PATH" -> binDirPath.toString()))

0 commit comments

Comments
 (0)