Unified and simplified checking functions at has_lib.js

Author: piranna

util/has_lib.js

@@ -1,4 +1,4 @@
-var childProcess = require('child_process')
+var execSync = require('child_process').execSync
 var fs = require('fs')
 
 var SYSTEM_PATHS = [
@@ -10,6 +10,16 @@ var SYSTEM_PATHS = [
   '/usr/lib/i386-linux-gnu'
 ]
 
+function _hasQuery (query) {
+  try {
+    // execSync throws on nonzero exit
+    execSync(query)
+    return true
+  } catch (err) {
+    return false
+  }
+}
+
 /**
  * Checks for lib using ldconfig if present, or searching SYSTEM_PATHS
  * otherwise.
@@ -18,21 +28,15 @@ var SYSTEM_PATHS = [
  */
 function hasSystemLib (lib) {
   var libName = 'lib' + lib + '.+(so|dylib)'
-  var libNameRegex = new RegExp(libName)
 
     // Try using ldconfig on linux systems
-  if (hasLdconfig()) {
-    try {
-      if (childProcess.execSync('ldconfig -p 2>/dev/null | grep -E "' +
-                                libName + '"').length) {
-        return true
-      }
-    } catch (err) {
-      // noop -- proceed to other search methods
-    }
+  if (_hasQuery('ldconfig -p 2>/dev/null | grep -E "' + libName + '"')) {
+    return true
   }
 
-    // Try checking common library locations
+  // Try checking common library locations
+  var libNameRegex = new RegExp(libName)
+
   return SYSTEM_PATHS.some(function (systemPath) {
     try {
       var dirListing = fs.readdirSync(systemPath)
@@ -45,37 +49,13 @@ function hasSystemLib (lib) {
   })
 }
 
-/**
- * Checks for ldconfig on the path and /sbin
- * @return Boolean exists
- */
-function hasLdconfig () {
-  try {
-    // Add /sbin to path as ldconfig is located there on some systems -- e.g.
-    // Debian (and it can still be used by unprivileged users):
-    childProcess.execSync('export PATH="$PATH:/sbin"', {stdio: 'ignore'})
-    process.env.PATH = '...'
-    // execSync throws on nonzero exit
-    childProcess.execSync('hash ldconfig 2>/dev/null')
-    return true
-  } catch (err) {
-    return false
-  }
-}
-
 /**
  * Checks for freetype2 with --cflags-only-I
  * @return Boolean exists
  */
 function hasFreetype () {
-  try {
-    if (childProcess.execSync('pkg-config cairo --cflags-only-I 2>/dev/null | ' +
-                              'grep freetype2').length) {
-      return true
-    }
-  } catch (err) {
-    return false
-  }
+  return _hasQuery('pkg-config cairo --cflags-only-I 2>/dev/null | ' +
+                   'grep freetype2')
 }
 
 /**
@@ -84,13 +64,7 @@ function hasFreetype () {
  * @return Boolean exists
  */
 function hasPkgconfigLib (lib) {
-  try {
-    // execSync throws on nonzero exit
-    childProcess.execSync('pkg-config --exists "' + lib + '" 2>/dev/null')
-    return true
-  } catch (err) {
-    return false
-  }
+  return _hasQuery('pkg-config --exists "' + lib + '" 2>/dev/null')
 }
 
 function main (query) {