Merge pull request #6 from homy-game-studio/fix-unity-version

Fix unity version

Author: MatheusMoura17

package-lock.json

@@ -30,7 +30,6 @@
     "ora": "^6.1.2",
     "simple-git": "^3.15.1",
     "template-directory": "^2.0.0",
-    "template-file": "^6.0.1",
     "typescript": "^4.9.3"
   },
   "devDependencies": {

package.json

@@ -5,7 +5,7 @@ import { createDirectory } from "./modules/directory";
 import { createRepo as createGitRepo } from "./modules/git";
 import input from "./modules/input";
 import { render as renderTemplate } from "./modules/render";
-import { createUnityProject, getUnityInstallations, openUnityProject } from "./modules/unity";
+import { createUnityProject, getUnityInstallations, openUnityProject, parseUnityVersion } from "./modules/unity";
 
 const run = <T>(promise: Promise<T>, text: string) => {
   return oraPromise(
@@ -23,7 +23,11 @@ const main = async () => {
     const projectPath = await run(createDirectory(inputData.packageName), "Create directory");
     await run(createUnityProject(unityPath, projectPath), "Create unity project");
     await run(createGitRepo(projectPath), "Create git repo");
-    await run(renderTemplate(inputData, projectPath), "Render template");
+    const renderData = {
+      ...inputData,
+      unityVersion: parseUnityVersion(inputData.unityVersion)
+    }
+    await run(renderTemplate(renderData, projectPath), "Render template");
     await run(openUnityProject(unityPath, projectPath), "Open unity project");
   } catch (e) {
     console.error(e);

src/index.ts

@@ -45,10 +45,21 @@ export const getUnityInstallations = async (): Promise<UnityInstallations> => {
   return installations;
 }
 
+export const parseUnityVersion = (raw: string) => {
+  const result = /^[0-9]+\.[0-9]+/gm.exec(raw);
+  if (!result || result.length === 0) throw `Failed to parse unity version ${raw}`;
+
+  return result[0];
+}
+
 export const createUnityProject = async (unityPath: string, projectPath: string) => {
   await execa(unityPath, ["-quit", "-batchmode", "-createProject", projectPath]);
 }
 
 export const openUnityProject = async (unityPath: string, projectPath: string) => {
-  await execa(unityPath, ["-projectPath", projectPath], { stdio: "ignore" });
+  await execa(unityPath, ["-projectPath", projectPath], {
+    stdio: "ignore",
+    detached: true,
+    cleanup: false,
+  });
 }