Merge pull request #164 from tgodzik/fix-utf

Add utf-8 to the process fetching Metals and fix downloading jabba
scalameta · Aug 14, 2020 · aee6828 · aee6828
2 parents f1d6a07 + ef47dbd
commit aee6828
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/fetchMetals.ts b/src/fetchMetals.ts
@@ -21,6 +21,7 @@ export function fetchMetals({
     [
       ...javaOptions,
       ...fetchProperties,
+      "-Dfile.encoding=UTF-8",
       "-jar",
       coursierPath,
       "fetch",

diff --git a/src/installJava.ts b/src/installJava.ts
@@ -30,14 +30,14 @@ export function installJava({
   const jabbaPath = path.join(bin, jabbaBinaryName());
 
   return mkdirp(bin)
-    .catch((err: Error) => {
-      console.debug(err);
-      outputChannel.appendLine(err.message);
-    })
     .then(() =>
-      download({ url: jabbaUrl, outputPath: jabbaPath, makeExecutable: true })
+      download({
+        url: jabbaUrl,
+        outputPath: jabbaPath,
+        makeExecutable: true,
+      })
     )
-    .then(() => pcp.exec(`${jabbaPath} ls-remote`))
+    .then(() => pcp.exec(`"${jabbaPath}" ls-remote`))
     .then((out) =>
       outputToString(out.stdout)
         .split("\n")
@@ -54,6 +54,11 @@ export function installJava({
         .then(() => outputChannel.appendLine(`${java} installed`))
         .then(() => pcp.exec(`${jabbaPath} which --home ${java}`))
         .then((e: pcp.Output) => outputToString(e.stdout).trim());
+    })
+    .catch((err: Error) => {
+      console.debug(err);
+      outputChannel.appendLine(err.message);
+      throw err;
     });
 }