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 · c247c65 · c247c65
1 parent 192274f
commit c247c65
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/blocks/net.rs b/src/blocks/net.rs
@@ -95,11 +95,8 @@ 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,
+                        "iw dev {} link | grep \"^\\sSSID:\" | sed \"s/^\\sSSID:\\s//g\"",
                         self.device
                     ),
                 ],
@@ -108,6 +105,22 @@ impl NetworkDevice {
             .block_error("net", "Failed to execute SSID query.")?
             .stdout;
 
+        if iw_output.len() == 0 {
+            mut iw_output = Command::new("sh")
+                .args(
+                    &[
+                        "-c",
+                        &format!(
+                            "nmcli -g general.connection device show {}",
+                            self.device
+                        ),
+                    ],
+                )
+                .output()
+                .block_error("net", "Failed to execute SSID query.")?
+                .stdout;
+        }
+
         if iw_output.len() == 0 {
             Ok(None)
         } else {