Create AIX mainline support (#13)

* Add AIX mainstream support * remove no-longer-needed AIX variant check * add ibmi.js to package.json * Fix style errors
silverwind · Mar 6, 2019 · eb1bce7 · eb1bce7
1 parent 2a7d01a
commit eb1bce7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/aix.js → ibmi.js b/aix.js → ibmi.js
@@ -5,13 +5,6 @@ const execa = require("execa");
 const db2util = "/QOpenSys/pkgs/bin/db2util";
 const sql = "select NEXT_HOP, LOCAL_BINDING_INTERFACE from QSYS2.NETSTAT_ROUTE_INFO where ROUTE_TYPE='DFTROUTE' and NEXT_HOP!='*DIRECT' and CONNECTION_TYPE=?";
 
-const checkVariant = () => {
-  const variant = require("os").type();
-  if (variant !== "OS400") {
-    throw new Error(`Unsupported AIX variant: ${variant}`);
-  }
-};
-
 const parse = stdout => {
   let result;
   try {
@@ -27,12 +20,10 @@ const parse = stdout => {
 };
 
 const promise = family => {
-  checkVariant();
   return execa.stdout(db2util, [sql, "-p", family, "-o", "json"]).then(stdout => parse(stdout));
 };
 
 const sync = family => {
-  checkVariant();
   const {stdout} = execa.sync(db2util, [sql, "-p", family, "-o", "json"]);
   return parse(stdout);
 };

diff --git a/index.js b/index.js
@@ -12,7 +12,11 @@ if ([
   "win32",
   "aix",
 ].indexOf(platform) !== -1) {
-  const families = require(`./${platform}`);
+  let platformModule = `./${platform}`;
+  if (platform === "aix") {
+    platformModule = (require("os").type() === "OS400") ? "./ibmi.js" : "./sunos.js";
+  }
+  const families = require(platformModule);
   module.exports.v4 = () => families.v4();
   module.exports.v6 = () => families.v6();
   module.exports.v4.sync = () => families.v4.sync();

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "openbsd.js",
     "sunos.js",
     "win32.js",
-    "aix.js"
+    "ibmi.js"
   ],
   "keywords": [
     "default gateway",