Skip to content

Commit 5710525

Browse files
committed
better arguments parsing
1 parent f6e71cd commit 5710525

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

wifi.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,17 @@ def get_wlans(cls):
121121
out = subprocess.check_output(["iwlist", "wlan0", "scan"])
122122

123123
@classmethod
124-
def set_client_params(cls, wssid, wpsk):
125-
os.system("sudo sed -i s/ssid=.*$/ssid='\"" + wssid + "\"'/ " + cls.wifi_client_conf_file)
126-
os.system("sudo sed -i s/psk=.*$/psk='\"" + wpsk + "\"'/ " + cls.wifi_client_conf_file)
124+
def set_client_params(cls, wssid=None, wpsk=None):
125+
if wssid:
126+
os.system("sudo sed -i s/ssid=.*$/ssid='\"" + wssid + "\"'/ " + cls.wifi_client_conf_file)
127+
if wpsk:
128+
os.system("sudo sed -i s/psk=.*$/psk='\"" + wpsk + "\"'/ " + cls.wifi_client_conf_file)
127129

128130
@classmethod
129-
def set_ap_params(cls, wssid, wpsk):
131+
def set_ap_params(cls, wssid=None, wpsk=None):
130132
adapter = cls.get_adapter_type()
131-
os.system("sudo sed -i s/ssid=.*$/ssid=" + wssid + "/ /etc/hostapd/" + cls.hostapds.get(adapter) + ".conf")
133+
if wssid:
134+
os.system("sudo sed -i s/ssid=.*$/ssid=" + wssid + "/ /etc/hostapd/" + cls.hostapds.get(adapter) + ".conf")
132135
if wpsk:
133136
os.system("sudo sed -i s/wpa_passphrase=.*$/wpa_passphrase=" + wpsk + "/ /etc/hostapd/" + cls.hostapds.get(adapter) + ".conf")
134137

@@ -243,12 +246,10 @@ def main():
243246
if args:
244247
if args['mode'] == 'ap':
245248
w.set_start_as_ap()
246-
if args.get('ssid') and args.get('pwd'):
247-
w.set_ap_params(args['ssid'], args['pwd'])
249+
w.set_ap_params(args['ssid'], args['pwd'])
248250
elif args['mode'] == 'client':
249251
w.set_start_as_client()
250-
if args.get('ssid') and args.get('pwd'):
251-
w.set_client_params(args['ssid'], args['pwd'])
252+
w.set_client_params(args['ssid'], args['pwd'])
252253
if args['name']:
253254
w.set_bot_name(args['name'])
254255
else:

0 commit comments

Comments
 (0)