diff --git a/lib/darwin.js b/lib/darwin.js index 5745259..a8d4b32 100644 --- a/lib/darwin.js +++ b/lib/darwin.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.10.0 +// Generated by CoffeeScript 1.12.4 (function() { var AirPortBinary, connectionStateMap, parsePatterns, powerStateMap; @@ -45,7 +45,7 @@ } }, getIfaceState: function() { - var KEY, VALUE, connectionData, error, error1, error2, i, interfaceState, k, len, ln, parsedLine, powerData, ref; + var KEY, VALUE, connectionData, error, i, interfaceState, k, len, ln, parsedLine, powerData, ref; interfaceState = {}; connectionData = this.execSync(AirPortBinary + " -I"); ref = connectionData.split('\n'); @@ -75,8 +75,8 @@ parsedLine = parsePatterns.airport_line.exec(powerData.trim()); KEY = parsedLine[1]; VALUE = parsedLine[2]; - } catch (error2) { - error = error2; + } catch (error1) { + error = error1; return { success: false, msg: "Unable to retrieve state of network interface " + this.WiFiControlSettings.iface + "." @@ -86,7 +86,7 @@ return interfaceState; }, connectToAP: function(_ap) { - var COMMANDS, _msg, com, connectToAPChain, error, error1, i, len, stdout; + var COMMANDS, _msg, com, connectToAPChain, error, i, len, stdout; COMMANDS = { connect: "networksetup -setairportnetwork " + this.WiFiControlSettings.iface + " \"" + _ap.ssid + "\"" }; diff --git a/lib/linux.js b/lib/linux.js index 8852a53..5d4effe 100644 --- a/lib/linux.js +++ b/lib/linux.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.10.0 +// Generated by CoffeeScript 1.12.4 (function() { var connectionStateMap, parsePatterns, powerStateMap; @@ -46,7 +46,7 @@ } }, getIfaceState: function() { - var KEY, VALUE, connectionData, connectionName, error, error1, error2, foundInterface, i, interfaceState, k, len, ln, parsedLine, powerData, ref, ssidData; + var KEY, VALUE, connectionData, connectionName, error, foundInterface, i, interfaceState, k, len, ln, parsedLine, powerData, ref, ssidData; interfaceState = {}; powerData = this.execSync("nmcli networking"); interfaceState.power = powerStateMap[powerData.trim()]; @@ -99,8 +99,8 @@ ssidData = this.execSync("nmcli -m multiline connection show \"" + connectionName + "\" | grep 802-11-wireless.ssid"); parsedLine = parsePatterns.nmcli_line.exec(ssidData.trim()); interfaceState.ssid = parsedLine[2]; - } catch (error2) { - error = error2; + } catch (error1) { + error = error1; return { success: false, msg: "Error while retrieving SSID information of network interface " + this.WiFiControlSettings.iface + ": " + error.stderr @@ -116,8 +116,8 @@ return interfaceState; }, scanForWiFi: function() { - var KEY, VALUE, _network, c, error, error1, i, j, k, len, len1, ln, networks, nwk, parsedLine, ref, ref1, scanResults; - scanResults = this.execSync("nmcli -m multiline device wifi list"); + var KEY, VALUE, _network, c, error, i, j, k, len, len1, ln, networks, nwk, parsedLine, ref, ref1, scanResults; + scanResults = this.execSync("nmcli -m multiline device wifi list ifname " + this.WiFiControlSettings.iface); networks = []; ref = scanResults.split('*:'); for (c = i = 0, len = ref.length; i < len; c = ++i) { @@ -158,7 +158,7 @@ return networks; }, connectToAP: function(_ap) { - var COMMANDS, _msg, com, connectToAPChain, error, error1, error2, i, len, ssidExist, stdout; + var COMMANDS, _msg, com, connectToAPChain, error, i, len, ssidExist, stdout; COMMANDS = { "delete": "nmcli connection delete \"" + _ap.ssid + "\"", connect: "nmcli device wifi connect \"" + _ap.ssid + "\"" @@ -186,8 +186,8 @@ this.WiFiLog("Executing:\t" + COMMANDS[com]); try { stdout = this.execSync(COMMANDS[com]); - } catch (error2) { - error = error2; + } catch (error1) { + error = error1; if (error.stderr.toString().trim() === ("Error: No network with SSID '" + _ap.ssid + "' found.")) { _msg = "Error: No network called " + _ap.ssid + " could be found."; this.WiFiLog(_msg, true); diff --git a/lib/wifi-control.js b/lib/wifi-control.js index e25548b..c08bf77 100644 --- a/lib/wifi-control.js +++ b/lib/wifi-control.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.10.0 +// Generated by CoffeeScript 1.12.4 (function() { var CXT, WiFiScanner, execSyncToBuffer, os_instructions; @@ -82,7 +82,7 @@ } }, findInterface: function(iface) { - var _msg, error, error1, interfaceResults; + var _msg, error, interfaceResults; if (iface == null) { iface = null; } @@ -112,7 +112,7 @@ } }, scanForWiFi: function(cb) { - var _msg, error, error1, networks; + var _msg, error, networks; if (CXT.WiFiControlSettings.iface == null) { _msg = "You cannot scan for nearby WiFi networks without a valid wireless interface."; CXT.WiFiLog(_msg, true); @@ -163,7 +163,7 @@ } }, connectToAP: function(_ap, cb) { - var _msg, check_iface, error, error1, request_msg, t0; + var _msg, check_iface, error, request_msg, t0; if (CXT.WiFiControlSettings.iface == null) { _msg = "You cannot connect to a WiFi network without a valid wireless interface."; CXT.WiFiLog(_msg, true); @@ -243,7 +243,7 @@ } }, resetWiFi: function(cb) { - var _msg, check_iface, error, error1, t0; + var _msg, check_iface, error, t0; try { os_instructions.resetWiFi.call(CXT); CXT.WiFiLog("Waiting for interface to finish resetting..."); @@ -284,7 +284,7 @@ } }, getIfaceState: function() { - var _msg, error, error1, interfaceState; + var _msg, error, interfaceState; try { interfaceState = os_instructions.getIfaceState.call(CXT); if (interfaceState.success !== false) { diff --git a/lib/win32.js b/lib/win32.js index b347f42..889882c 100644 --- a/lib/win32.js +++ b/lib/win32.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.10.0 +// Generated by CoffeeScript 1.12.4 (function() { var connectionStateMap, fs, parsePatterns, win32WirelessProfileBuilder; @@ -64,7 +64,7 @@ } }, getIfaceState: function() { - var KEY, VALUE, connectionData, error, error1, interfaceState, j, k, len, ln, ln_trim, parsedLine, ref; + var KEY, VALUE, connectionData, error, interfaceState, j, k, len, ln, ln_trim, parsedLine, ref; interfaceState = {}; connectionData = this.execSync("netsh " + this.WiFiControlSettings.iface + " show interface"); ref = connectionData.split('\n'); @@ -113,7 +113,7 @@ return interfaceState; }, connectToAP: function(_ap) { - var COMMANDS, _msg, com, connectToAPChain, error, error1, error2, i, j, l, len, ref, ssid, stdout, xmlContent; + var COMMANDS, _msg, com, connectToAPChain, error, i, j, l, len, ref, ssid, stdout, xmlContent; this.WiFiLog("Generating win32 wireless profile..."); ssid = { plaintext: _ap.ssid, @@ -149,8 +149,8 @@ this.WiFiLog("Executing:\t" + COMMANDS[com]); try { stdout = this.execSync(COMMANDS[com]); - } catch (error2) { - error = error2; + } catch (error1) { + error = error1; } this.WiFiLog("Success!"); } diff --git a/src/linux.coffee b/src/linux.coffee index b959c32..d84a3d0 100644 --- a/src/linux.coffee +++ b/src/linux.coffee @@ -104,7 +104,7 @@ module.exports = # # Use nmcli to list visible wifi networks. # - scanResults = @execSync "nmcli -m multiline device wifi list" + scanResults = @execSync "nmcli -m multiline device wifi list ifname #{@WiFiControlSettings.iface}" # # Parse the results into an array of AP objects to match # the structure found in node-wifiscanner2 for win32 and MacOS.