Merge pull request #26 from barak/master

robustness and safety tweaks

wifi_password/wifi_password.py

@@ -36,14 +36,14 @@ def get_ssid():
         if which("nmcli") is None:
             print_error("Network Manager is required to run this program on Linux.")
 
-        ssid = run_command("nmcli -t -f active,ssid dev wifi | egrep '^yes' | cut -d\: -f2")
+        ssid = run_command("nmcli -t -f active,ssid dev wifi | egrep '^yes:' | sed 's/^yes://'")
         ssid = ssid.replace("\n", "")
 
     elif sys.platform == "win32":
         ssid = run_command("netsh wlan show interfaces | findstr SSID").replace("\r", "")
         if ssid == "":
             print_error("SSID was not found")
-        
+
         ssid = re.findall(r"[^B]SSID\s+:\s(.*)", ssid)[0]
 
     return ssid
@@ -60,9 +60,10 @@ def get_password(ssid):
     elif sys.platform == "linux":
         # Check if the user is running with super user privilages
         if os.geteuid() != 0:
-            print_error(f"You need to run '{sys.argv[0]}' as root")
+            password = run_command(f"sudo nmcli -s -g 802-11-wireless-security.psk connection show '{ssid}'")
+        else:
+            password = run_command(f"nmcli -s -g 802-11-wireless-security.psk connection show '{ssid}'")
 
-        password = run_command(f"nmcli -s -g 802-11-wireless-security.psk connection show '{ssid}'")
         password = password.replace("\n", "")
 
     elif sys.platform == "win32":