potential fix for #146

OpenZWave · Jan 30, 2017 · 9ff667a · 9ff667a
1 parent 151d33f
commit 9ff667a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -48,10 +48,10 @@
 	        }],
 			["OS=='linux'", {
 				"variables": {
-					"OZW_INC"         : "<!(node -e \"console.log(require('./lib/ozwpaths.js').includedir)\")",
-					"OZW_LIB_PATH"    : "<!(node -e \"console.log(require('./lib/ozwpaths.js').libdir)\")",
-					"OZW_ETC"         : "<!(node -e \"console.log(require('./lib/ozwpaths.js').sysconfdir)\")",
-					"OZW_DOC"         : "<!(node -e \"console.log(require('./lib/ozwpaths.js').docdir)\")"
+					"OZW_INC"         : "<!(node -p \"require('./lib/ozwpaths.js').includedir\")",
+					"OZW_LIB_PATH"    : "<!(node -p \"require('./lib/ozwpaths.js').libdir\")",
+					"OZW_ETC"         : "<!(node -p \"require('./lib/ozwpaths.js').sysconfdir\")",
+					"OZW_DOC"         : "<!(node -p \"require('./lib/ozwpaths.js').docdir\")"
 				},
         		"defines": [
 					"OPENZWAVE_ETC=<!@(node -p -e \"'<(OZW_ETC)'.length ? '<(OZW_ETC)' : '/usr/local/etc/openzwave'\")",

diff --git a/lib/ozwpaths.js b/lib/ozwpaths.js
@@ -53,7 +53,7 @@ var configs = {
 
 var usepkgconfig = true;
 try {
-  cp.execSync("pkg-config --exists libopenzwave");
+  cp.execSync("pkg-config --exists libopenzwave 2>/dev/null");
 } catch (e) {
   usepkgconfig = false;
 }

diff --git a/test2.js b/test2.js
@@ -143,6 +143,6 @@ zwave.connect(zwavedriverpaths[os.platform()]);
 
 process.on('SIGINT', function() {
   console.log('disconnecting...');
-  zwave.disconnect();
+  zwave.disconnect(zwavedriverpaths[os.platform()]);
   process.exit();
 });