Merge remote-tracking branch 'my/yaro/registry-prompt' into yaro/regi…

…stry-prompt
graphprotocol · Dec 10, 2024 · a88bce0 · a88bce0
2 parents aa2bd67 + 1d53441
commit a88bce0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/packages/cli/src/command-helpers/file-resolver.ts b/packages/cli/src/command-helpers/file-resolver.ts
@@ -65,7 +65,7 @@ export async function resolveFile(
 
       throw new Error('Invalid file source. Must be a file path, IPFS hash, or URL');
     } catch (error) {
-      await cleanup();
+      cleanup();
       throw error;
     }
   };

diff --git a/packages/cli/src/command-helpers/prompt-manager.ts b/packages/cli/src/command-helpers/prompt-manager.ts
@@ -59,7 +59,7 @@ export class PromptManager {
         }
         if (isCtrlC || this.currentStep === 0) {
           process.stdout.write('\n');
-          process.exit(0);
+          process.exit(1);
         }
 
         this.currentStep--;

diff --git a/packages/cli/src/command-helpers/scaffold.ts b/packages/cli/src/command-helpers/scaffold.ts
@@ -108,10 +108,8 @@ const writeScaffoldDirectory = async (scaffold: any, directory: string, spinner:
     const filename = path.join(directory, basename);
 
     // Write file or recurse into subdirectory
-    if (typeof content === 'string') {
+    if (typeof content === 'string' || Buffer.isBuffer(content)) {
       await fs.writeFile(filename, content, 'utf-8');
-    } else if (Buffer.isBuffer(content)) {
-      await fs.writeFile(filename, content);
     } else if (content == null) {
       return; // continue loop
     } else {

diff --git a/packages/cli/src/commands/add.ts b/packages/cli/src/commands/add.ts
@@ -77,10 +77,8 @@ export default class AddCommand extends Command {
     let contractService: ContractService | undefined;
 
     if (isLocalHost) this.warn('`localhost` network detected, prompting user for inputs');
-    else {
-      const registry = await loadRegistry();
-      contractService = new ContractService(registry);
-    }
+    const registry = await loadRegistry();
+    contractService = new ContractService(registry);
 
     let startBlock = startBlockFlag;
     let contractName = contractNameFlag;