fix: allow server updates when installed in /usr/local (#859)

* fix: allow server updates when installed in /usr/local fixes #857 * refactor: use list npmServerInstallLocations
SignalK · Sep 8, 2019 · d75fb89 · d75fb89
2 parents 7177c5b + 3c96c5a
commit d75fb89
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/interfaces/appstore.js b/lib/interfaces/appstore.js
@@ -20,8 +20,15 @@ const compareVersions = require('compare-versions')
 const installModule = require('../modules').installModule
 const { findModulesWithKeyword, getLatestServerVersion } = require('../modules')
 
+const npmServerInstallLocations = [
+  '/usr/bin/signalk-server',
+  '/usr/lib/node_modules/signalk-server/bin/signalk-server',
+  '/usr/local/bin/signalk-server',
+  '/usr/local/lib/node_modules/signalk-server/bin/signalk-server'
+]
+
 module.exports = function (app) {
-  let moduleInstalling = undefined
+  let moduleInstalling
   const modulesInstalledSinceStartup = {}
   const moduleInstallQueue = []
 
@@ -122,10 +129,8 @@ module.exports = function (app) {
     }
 
     if (
-      process.argv.length > 0 &&
-      (process.argv[1] === '/usr/bin/signalk-server' ||
-        process.argv[1] ===
-          '/usr/lib/node_modules/signalk-server/bin/signalk-server') &&
+      process.argv.length > 1 &&
+      npmServerInstallLocations.includes(process.argv[1]) &&
       !process.env.SIGNALK_DISABLE_SERVER_UPDATES
     ) {
       all.canUpdateServer = true