fix getting wifi ssid on ubuntu

on ubuntu and probably other systems, /bin/sh does not support `-o pipefail` closes greshake#280
mathroc · Oct 8, 2018 · 3cbc225 · 3cbc225
1 parent 192274f
commit 3cbc225
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/blocks/net.rs b/src/blocks/net.rs
@@ -95,12 +95,10 @@ impl NetworkDevice {
             .args(
                 &[
                     "-c",
-                    "-o",
-                    "pipefail",
                     &format!(
-                        "iw dev {} link | grep \"^\\sSSID:\" | sed \"s/^\\sSSID:\\s//g\" || nmcli -g general.connection device show {}",
                         self.device,
                         self.device
+                         "ssid=\$(iw dev {} link | grep \"^\\sSSID:\" | sed \"s/^\\sSSID:\\s//g\"); [ \$ssid -eq "" ] && ssid=\$(nmcli -g general.connection device show {}); echo \$ssid",                         self.device
                     ),
                 ],
             )