@@ -15,22 +15,21 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
15
15
Version (newVersion) > Version (oldVersion)
16
16
}
17
17
18
- private def loggingEqual (version : String ) = {
18
+ private def logEqual (version : String ) = {
19
19
System .err.println(
20
20
s " Scala-cli $version is already installed and up-to-date. "
21
21
)
22
22
sys.exit(0 )
23
23
}
24
24
25
- private def loggingUpdate (env : Boolean , newVersion : String , oldVersion : String ) = {
25
+ private def logUpdate (env : Boolean , newVersion : String , oldVersion : String ) =
26
26
if (! env) println(
27
27
s """ scala-cli $oldVersion is already installed and out-of-date.
28
28
|scala-cli will be updated to version $newVersion
29
29
| """ .stripMargin
30
30
)
31
- }
32
31
33
- private def loggingDowngrade (env : Boolean , newVersion : String , oldVersion : String ) = {
32
+ private def logDowngrade (env : Boolean , newVersion : String , oldVersion : String ) =
34
33
if (! env && coursier.paths.Util .useAnsiOutput()) {
35
34
println(s " scala-cli $oldVersion is already installed and up-to-date. " )
36
35
println(s " Do you want to downgrade scala-cli to version $newVersion [Y/n] " )
@@ -46,7 +45,6 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
46
45
)
47
46
sys.exit(1 )
48
47
}
49
- }
50
48
51
49
def run (options : InstallHomeOptions , args : RemainingArgs ): Unit = {
52
50
@@ -62,13 +60,12 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
62
60
os.proc(binDirPath / options.binaryName, " version" ).call(cwd = os.pwd).out.text.trim
63
61
}.toOption.getOrElse(" 0.0.0" )
64
62
65
- if (os.exists(binDirPath)) {
63
+ if (os.exists(binDirPath))
66
64
if (options.force) () // skip logging
67
- else if (newVersion == oldVersion) loggingEqual (newVersion)
65
+ else if (newVersion == oldVersion) logEqual (newVersion)
68
66
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)
72
69
73
70
os.remove.all(binDirPath)
74
71
@@ -80,9 +77,8 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
80
77
if (! Properties .isWin)
81
78
os.perms.set(binDirPath / options.binaryName, os.PermSet .fromString(" rwxr-xr-x" ))
82
79
83
- if (options.env) {
84
- println(s """ export PATH=" $$ PATH: $binDirPath" """ )
85
- }
80
+ if (options.env)
81
+ println(s """ export PATH=" $binDirPath: $$ PATH" """ )
86
82
else {
87
83
88
84
val update = EnvironmentUpdate (Nil , Seq (" PATH" -> binDirPath.toString()))
0 commit comments