Merge branch 'master' into develop

# Conflicts: # package.json # src/lib/helpers/getTmp.js # src/middleware/buildGame.js
chrismaltby · Jun 25, 2019 · 1f39a48 · 1f39a48
2 parents 70f949a + 2ec8619
commit 1f39a48
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/lib/helpers/getTmp.js b/src/lib/helpers/getTmp.js
@@ -1,12 +1,17 @@
 import { remote } from "electron";
+import fs from "fs-extra";
 
 export default () => {
-  const tmpPath = remote.app.getPath("temp");
-  if (tmpPath.indexOf(" ") === -1) {
-    return tmpPath;
-  }
-  if (process.platform === "win32") {
-    return "C:\tmp";
-  }
-  return "/tmp";
+  let tmpPath = remote.app.getPath("temp");
+  if (
+    tmpPath.indexOf(" ") === -1 &&
+    tmpPath.indexOf(".itch") === -1 &&
+    (process.platform !== "win32" || tmpPath.length < 35)
+  ) {
+    // Ok
+  } else if (process.platform === "win32") {
+    tmpPath = "C:\\tmp";
+  } else tmpPath = "/tmp";
+  fs.ensureDirSync(tmpPath);
+  return tmpPath;
 };