more fixes, changes, and imporvements to fix botway npm installer

abdfnx · May 8, 2022 · 76e9540 · 76e9540
1 parent f226efe
commit 76e9540
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/installer/npm/bin/botway.js b/installer/npm/bin/botway.js
diff --git a/installer/npm/botway.js b/installer/npm/botway.js
@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+import { execFileSync } from "child_process";
+import { exit } from "process";
+
+try {
+  execFileSync("./botwaybin", process.argv.slice(2), {
+    stdio: "inherit",
+  });
+} catch (e) {
+  console.log(e);
+  exit(1);
+}
diff --git a/installer/npm/postinstall.js b/installer/npm/postinstall.js
@@ -38,7 +38,7 @@ async function install() {
     if (old == "yes") {
       return path.join(f, "bin");
     } else if (old == "no") {
-      return "bin";
+      return "bbin";
     } else {
       return f;
     }
@@ -67,8 +67,13 @@ async function install() {
     if (err) throw err;
   });
 
+  await fs.rename("bbin/botway", "botwaybin", function (err) {
+    if (err) throw err;
+  });
+
   await fs.rm(zipFile);
   await fs.rm(folder(), { recursive: true });
+  await fs.rm("bbin", { recursive: true });
 }
 
 install()

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "node": ">=8.0.0"
   },
   "bin": {
-    "botway": "installer/npm/bin/botway.js"
+    "botway": "installer/npm/botway.js"
   },
   "scripts": {
     "postinstall": "node ./installer/npm/postinstall.js"