From f5c2cad255c2e92da691898c341dd7e194574cd8 Mon Sep 17 00:00:00 2001 From: Dinu Date: Mon, 10 Dec 2018 13:43:38 +0000 Subject: [PATCH] fix child_process.exec options format --- src/linux-connect.js | 2 +- src/linux-current-connections.js | 2 +- src/linux-disconnect.js | 4 ++-- src/linux-scan.js | 2 +- src/mac-connect.js | 2 +- src/mac-current-connections.js | 2 +- src/mac-scan.js | 2 +- src/windows-connect.js | 4 ++-- src/windows-current-connections.js | 2 +- src/windows-disconnect.js | 2 +- src/windows-scan.js | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/linux-connect.js b/src/linux-connect.js index 61d27ba..9c828c9 100644 --- a/src/linux-connect.js +++ b/src/linux-connect.js @@ -16,7 +16,7 @@ function connectToWifi(config, ap, callback) { // commandStr = escapeShell(commandStr); - exec(commandStr, env, function(err, resp) { + exec(commandStr, {env}, function(err, resp) { callback && callback(err); }); } diff --git a/src/linux-current-connections.js b/src/linux-current-connections.js index 8f43a67..70543f5 100644 --- a/src/linux-current-connections.js +++ b/src/linux-current-connections.js @@ -8,7 +8,7 @@ function getCurrentConnection(config, callback) { commandStr += ' list ifname '+config.iface; } - exec(commandStr, env, function(err, scanResults) { + exec(commandStr, {env}, function(err, scanResults) { if (err) { callback && callback(err); return; diff --git a/src/linux-disconnect.js b/src/linux-disconnect.js index cb82549..b73c062 100644 --- a/src/linux-disconnect.js +++ b/src/linux-disconnect.js @@ -7,8 +7,8 @@ function disconnect (config, callback) { if (config.iface) { commandStr += " " + config.iface; } - - exec(commandStr, env, function(err, resp) { + + exec(commandStr, {env}, function(err, resp) { callback && callback(err); }); diff --git a/src/linux-scan.js b/src/linux-scan.js index 2b9513e..cf38a91 100644 --- a/src/linux-scan.js +++ b/src/linux-scan.js @@ -8,7 +8,7 @@ function scanWifi(config, callback) { commandStr += ' ifname '+config.iface; } - exec(commandStr, env, function(err, scanResults) { + exec(commandStr, {env}, function(err, scanResults) { if (err) { callback && callback(err); return; diff --git a/src/mac-connect.js b/src/mac-connect.js index d0eb34f..6d2ba3c 100644 --- a/src/mac-connect.js +++ b/src/mac-connect.js @@ -13,7 +13,7 @@ function connectToWifi(config, ap, callback) { commandStr = commandStr + "'" + iface + "'" + " " + "'" + ap.ssid + "'" + " " + "'" + ap.password + "'"; //console.log(commandStr); - exec(commandStr, env, function(err, resp, stderr) { + exec(commandStr, {env}, function(err, resp, stderr) { //console.log(stderr, resp); if (resp && resp.indexOf('Failed to join network') >= 0) { callback && callback(resp); diff --git a/src/mac-current-connections.js b/src/mac-current-connections.js index 2eb83e8..1f6cd5c 100644 --- a/src/mac-current-connections.js +++ b/src/mac-current-connections.js @@ -35,7 +35,7 @@ function parseAirport (stdout) { function getCurrentConnections(config, callback) { var commandStr = macProvider+" --getinfo" ; - exec(commandStr, env, function(err, stdout) { + exec(commandStr, {env}, function(err, stdout) { if (err) { callback && callback(err); } else { diff --git a/src/mac-scan.js b/src/mac-scan.js index 6802ab1..efc16f0 100644 --- a/src/mac-scan.js +++ b/src/mac-scan.js @@ -8,7 +8,7 @@ function scanWifi(config, callback) { var networks = [] var network = {} - exec(macProvider + ' -s', env, function(err, scanResults) { + exec(macProvider + ' -s', {env}, function(err, scanResults) { if (err) { callback && callback(err); diff --git a/src/windows-connect.js b/src/windows-connect.js index 8c672ec..6680b35 100644 --- a/src/windows-connect.js +++ b/src/windows-connect.js @@ -5,7 +5,7 @@ var scan = require('./windows-scan'); function execCommand(cmd) { return new Promise(function(resolve, reject) { - exec(cmd, env, function(err, stdout, stderr) { + exec(cmd, {env}, function(err, stdout, stderr) { if (err) { // Add command output to error, so it's easier to handle err.stdout = stdout; @@ -49,7 +49,7 @@ function connectToWifi(config, ap, callback) { callback && callback(); }) .catch(function(err) { - exec('netsh wlan delete profile "' + ap.ssid + '"', env, function() { + exec('netsh wlan delete profile "' + ap.ssid + '"', {env}, function() { callback && callback(err); }); }); diff --git a/src/windows-current-connections.js b/src/windows-current-connections.js index 327beb5..cd0d0f9 100644 --- a/src/windows-current-connections.js +++ b/src/windows-current-connections.js @@ -66,7 +66,7 @@ function parseShowInterfaces (stdout, config) { function getCurrentConnection(config, callback) { var commandStr = "netsh wlan show interfaces" ; - exec(commandStr, env, function(err, stdout) { + exec(commandStr, {env}, function(err, stdout) { if (err) { callback && callback(err); } else { diff --git a/src/windows-disconnect.js b/src/windows-disconnect.js index c9d7dbc..48ab61e 100644 --- a/src/windows-disconnect.js +++ b/src/windows-disconnect.js @@ -6,7 +6,7 @@ function disconnect (config, callback) { if (config.iface) { cmd += ' interface="' + config.iface + '"' } - exec(cmd, env, function(err, resp) { + exec(cmd, {env}, function(err, resp) { callback && callback(err); }); } diff --git a/src/windows-scan.js b/src/windows-scan.js index 8602703..aa39e89 100644 --- a/src/windows-scan.js +++ b/src/windows-scan.js @@ -4,7 +4,7 @@ var env = require('./env'); function scanWifi(config, callback) { try { - exec("chcp 65001 && netsh wlan show networks mode=Bssid", env, function(err, scanResults) { + exec("chcp 65001 && netsh wlan show networks mode=Bssid", {env}, function(err, scanResults) { if (err) { callback && callback(err); return;