Avoid shadowing stdout/stderr and log on error

geldata · Jan 3, 2024 · 4649104 · 4649104
1 parent 908b083
commit 4649104
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/packages/create/src/recipes/_edgedb/index.ts b/packages/create/src/recipes/_edgedb/index.ts
@@ -75,25 +75,32 @@ const recipe: Recipe<EdgeDBOptions> = {
       }
 
       spinner.start("Initializing EdgeDB project");
-      await execInLoginShell("edgedb project init --non-interactive", {
-        cwd: projectDir,
-      });
-      const { stdout, stderr } = await execInLoginShell(
-        "edgedb query 'select sys::get_version_as_str()'",
-        { cwd: projectDir }
-      );
-      const serverVersion = JSON.parse(stdout.trim());
-      logger(`EdgeDB server version: ${serverVersion}`);
-      if (serverVersion === "") {
-        const err = new Error(
-          "There was a problem initializing the EdgeDB project"
+      try {
+        await execInLoginShell("edgedb project init --non-interactive", {
+          cwd: projectDir,
+        });
+        const { stdout, stderr } = await execInLoginShell(
+          "edgedb query 'select sys::get_version_as_str()'",
+          { cwd: projectDir }
         );
-        spinner.stop(err.message);
-        logger({ stdout, stderr });
-
-        throw err;
+        const serverVersion = JSON.parse(stdout.trim());
+        logger(`EdgeDB server version: ${serverVersion}`);
+        if (serverVersion === "") {
+          const err = new Error(
+            "There was a problem initializing the EdgeDB project"
+          );
+          spinner.stop(err.message);
+          logger({ stdout, stderr });
+
+          throw err;
+        }
+        spinner.stop(`EdgeDB v${serverVersion} project initialized`);
+      } catch (error) {
+        logger(error);
+        throw error;
+      } finally {
+        spinner.stop();
       }
-      spinner.stop(`EdgeDB v${serverVersion} project initialized`);
     } else {
       logger("Skipping edgedb project init");
       logger("Copying basic EdgeDB project files");