fixing hang in alpine linux and adding test (#147)

tabrindle · Feb 26, 2020 · cc2f270 · cc2f270
1 parent 80df989
commit cc2f270
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/__tests__/utils.test.js b/__tests__/utils.test.js
@@ -34,6 +34,13 @@ const cases = {
     string: '3.4.3\n  Installed: rpm-4.11.3-35.el7.x86_64 at 2019-03-05 17:35\n',
     version: '3.4.3',
   },
+  ash: {
+    string: `
+    BusyBox v1.31.1 () multi-call binary.
+
+    Usage: ash [-/+OPTIONS] [-/+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]`,
+    version: '1.31.1', 
+  },
   bash: {
     string: 'GNU bash, version 4.4.12(1)-release (x86_64-apple-darwin17.0.0)',
     version: '4.4.12',

diff --git a/src/helpers/system.js b/src/helpers/system.js
@@ -43,7 +43,7 @@ module.exports = {
     } else if (utils.isLinux) {
       version = utils.run('cat /etc/os-release').then(v => {
         const distro = (v || '').match(/NAME="(.+)"/);
-        const versionInfo = (v || '').match(/VERSION="(.+)"/) || null;
+        const versionInfo = (v || '').match(/VERSION="(.+)"/) || ['', ''];
         const versionStr = versionInfo !== null ? versionInfo[1] : '';
         return `${distro[1]} ${versionStr}`.trim() || '';
       });
@@ -64,10 +64,13 @@ module.exports = {
     if (utils.isMacOS || utils.isLinux) {
       const shell =
         process.env.SHELL || utils.runSync('getent passwd $LOGNAME | cut -d: -f7 | head -1');
-      return Promise.all([
-        utils.run(`${shell} --version`).then(utils.findVersion),
-        utils.which(shell),
-      ]).then(v => utils.determineFound('Shell', v[0] || 'Unknown', v[1]));
+
+      let command = `${shell} --version 2>&1`;
+      if (shell.match('/bin/ash')) command = `${shell} --help 2>&1`;
+
+      return Promise.all([utils.run(command).then(utils.findVersion), utils.which(shell)]).then(v =>
+        utils.determineFound('Shell', v[0] || 'Unknown', v[1])
+      );
     }
     return Promise.resolve(['Shell', 'N/A']);
   },