summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby <robby@k-state.edu>2019-01-15 21:02:36 -0600
committerRobby <robby@k-state.edu>2019-01-15 21:02:36 -0600
commit1afeeadec528c9a67133e83940c04f63914438b8 (patch)
treed12aa13230be8541ff601eb9fba80848f3ba6246
parent738be726656afcdc45267523679f0d8185d834d4 (diff)
downloadmill-1afeeadec528c9a67133e83940c04f63914438b8.tar.gz
mill-1afeeadec528c9a67133e83940c04f63914438b8.tar.bz2
mill-1afeeadec528c9a67133e83940c04f63914438b8.zip
Fixed #511.
-rwxr-xr-x[-rw-r--r--].appveyor.yml4
-rwxr-xr-x[-rw-r--r--]main/core/src/util/Loggers.scala6
2 files changed, 3 insertions, 7 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 4cd5bfa0..1bd0c4c7 100644..100755
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,7 +33,7 @@ build_script:
cmd /C C:\mill\out\release\dest\mill.bat -i all main.test scalajslib.test)
- if [%COMPILER%]==[msys2] (
SET "PATH=%JAVA_HOME%\bin;C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%" &&
- C:\%MSYS2_DIR%\usr\bin\bash -lc 'os.makeDir.all -p /usr/local/bin' &&
+ C:\%MSYS2_DIR%\usr\bin\bash -lc 'mkdir -p /usr/local/bin' &&
C:\%MSYS2_DIR%\usr\bin\bash -lc "curl -Lo /usr/local/bin/mill %MILL_URL%" &&
C:\%MSYS2_DIR%\usr\bin\bash -lc 'chmod +x /usr/local/bin/mill' &&
C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && mill -i dev.assembly" &&
@@ -41,7 +41,7 @@ build_script:
C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && out/dev/assembly/dest/mill.bat -i all main.test scalajslib.test")
- if [%COMPILER%]==[cygwin] (
SET "PATH=%JAVA_HOME%\bin;C:\%CYGWIN_DIR%\bin;C:\%CYGWIN_DIR%\usr\bin;%PATH%" &&
- C:\%CYGWIN_DIR%\bin\bash -lc 'os.makeDir.all -p /usr/local/bin' &&
+ C:\%CYGWIN_DIR%\bin\bash -lc 'mkdir -p /usr/local/bin' &&
C:\%CYGWIN_DIR%\bin\bash -lc "curl -Lo /usr/local/bin/mill %MILL_URL%" &&
C:\%CYGWIN_DIR%\bin\bash -lc 'sed -i '"'"'0,/-cp "\$0"/{s/-cp "\$0"/-cp `cygpath -w "\$0"`/}; 0,/-cp "\$0"/{s/-cp "\$0"/-cp `cygpath -w "\$0"`/}'"'"' /usr/local/bin/mill' &&
C:\%CYGWIN_DIR%\bin\bash -lc 'chmod +x /usr/local/bin/mill' &&
diff --git a/main/core/src/util/Loggers.scala b/main/core/src/util/Loggers.scala
index 4771d782..dd7d111d 100644..100755
--- a/main/core/src/util/Loggers.scala
+++ b/main/core/src/util/Loggers.scala
@@ -111,11 +111,7 @@ case class FileLogger(colored: Boolean, file: os.Path, debugEnabled: Boolean) ex
new PrintStream(new FileOutputStream(file.toIO.getAbsolutePath))
}
- lazy val errorStream = {
- if (!outputStreamUsed) os.remove.all(file)
- outputStreamUsed = true
- new PrintStream(new FileOutputStream(file.toIO.getAbsolutePath))
- }
+ lazy val errorStream = outputStream
def info(s: String) = outputStream.println(s)
def error(s: String) = outputStream.println(s)