From a8a16e24b30606545a6583ba05bcdfa7ef9c39c2 Mon Sep 17 00:00:00 2001
From: Anton Nikolaev <nikoant@fb.com>
Date: Thu, 2 Jul 2020 10:19:07 -0700
Subject: [PATCH] Set exit code to 1 if script failed

Summary: Fixed scripts to return exit code 1 in case of error.

Reviewed By: passy

Differential Revision: D22357664

fbshipit-source-id: 1e067fe507e8f33cf21e70f3d15fd97175b9544e
---
 desktop/package.json                  |  3 +--
 desktop/scripts/build-plugin.ts       | 17 +++++++++++++----
 desktop/scripts/resolve-plugin-dir.ts | 13 ++++++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/desktop/package.json b/desktop/package.json
index a0307cc8b..17aaf57dc 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -235,9 +235,9 @@
     "build:dev": "cross-env NODE_ENV=development ./ts-node scripts/build-release.ts $@",
     "prebuild-headless": "yarn build:pkg",
     "build-headless": "cross-env NODE_ENV=production ./ts-node scripts/build-headless.ts $@",
-    "prebuild-plugin": "yarn build:pkg",
     "build-plugin": "./ts-node scripts/build-plugin.ts",
     "resolve-plugin-dir": "./ts-node scripts/resolve-plugin-dir.ts",
+    "list-plugins": "./ts-node scripts/list-plugins.ts",
     "open-dist": "open ../dist/mac/Flipper.app --args --launcher=false --inspect=9229",
     "fix": "eslint . --fix --ext .js,.ts,.tsx",
     "pretest": "yarn build:pkg",
@@ -253,7 +253,6 @@
     "lint": "yarn lint:eslint && yarn lint:flow && yarn lint:tsc",
     "bump-versions": "./ts-node scripts/bump-versions.ts",
     "publish-packages": "./ts-node scripts/publish-packages.ts",
-    "list-plugins": "./ts-node scripts/list-plugins.ts",
     "everything": "yarn reset && yarn install && yarn lint && yarn test && yarn test-electron && yarn build --mac --mac-dmg --win --linux --linux-deb && yarn build-headless --mac --linux && yarn start"
   },
   "optionalDependencies": {
diff --git a/desktop/scripts/build-plugin.ts b/desktop/scripts/build-plugin.ts
index ba1028abe..ad12445b0 100644
--- a/desktop/scripts/build-plugin.ts
+++ b/desktop/scripts/build-plugin.ts
@@ -13,10 +13,10 @@ import fs from 'fs-extra';
 import {execSync} from 'child_process';
 import {resolvePluginDir} from './workspaces';
 
-(async function buildPlugin() {
-  const pluginName = process.argv[2];
+async function buildPlugin(argv: string[]) {
+  const pluginName = argv[2];
   const pluginDir = await resolvePluginDir(pluginName);
-  const outputFileArg = process.argv.length > 3 ? process.argv[3] : null;
+  const outputFileArg = argv.length > 3 ? argv[3] : null;
   const outputFile = outputFileArg
     ? path.resolve(outputFileArg)
     : path.join(
@@ -30,4 +30,13 @@ import {resolvePluginDir} from './workspaces';
   const packCmd = `yarn pack --cwd "${pluginDir}" --filename ${outputFile}`;
   execSync(bundleCmd, {cwd: rootDir, stdio: 'inherit'});
   execSync(packCmd, {cwd: rootDir, stdio: 'inherit'});
-})();
+}
+
+buildPlugin(process.argv)
+  .then(() => {
+    process.exit(0);
+  })
+  .catch((err: any) => {
+    console.error(err);
+    process.exit(1);
+  });
diff --git a/desktop/scripts/resolve-plugin-dir.ts b/desktop/scripts/resolve-plugin-dir.ts
index 9897635fb..ee5a26ba6 100644
--- a/desktop/scripts/resolve-plugin-dir.ts
+++ b/desktop/scripts/resolve-plugin-dir.ts
@@ -9,8 +9,11 @@
 
 import {resolvePluginDir} from './workspaces';
 
-(async function () {
-  const pluginName = process.argv[2];
-  const pluginDir = await resolvePluginDir(pluginName);
-  console.log(pluginDir);
-})();
+resolvePluginDir(process.argv[2])
+  .then((dir) => {
+    console.log(dir);
+  })
+  .catch((err: any) => {
+    console.error(err);
+    process.exit(1);
+  });