Prevent precocious abortion of url::open and clipboard copy (#345)

denisidoro · Apr 16, 2020 · d7d3321 · d7d3321
1 parent 17b9987
commit d7d3321
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/clipboard.rs b/src/clipboard.rs
@@ -35,7 +35,8 @@ echo -n "$x" | _copy"#,
             .as_str(),
         )
         .spawn()
-        .map_err(|e| BashSpawnError::new(cmd, e))?;
+        .map_err(|e| BashSpawnError::new(cmd, e))?
+        .wait()?;
 
     Ok(())
 }
diff --git a/src/flows/func.rs b/src/flows/func.rs
@@ -10,15 +10,37 @@ pub fn main(func: String, args: Vec<String>) -> Result<(), Error> {
                 .into_iter()
                 .next()
                 .ok_or_else(|| anyhow!("No URL specified"))?;
+            let code = r#"
+exst() {
+   type "$1" &>/dev/null
+}
+
+_open_url() { 
+    local -r url="$1"
+    if exst xdg-open; then
+        xdg-open "$url" &disown
+    elif exst open; then
+        echo "$url" | xargs -I% open "%"
+    else
+        exit 55
+    fi
+}"#;
             let cmd = format!(
-                r#"url="{}"; (xdg-open "$url" 2> /dev/null || open "$url" 2> /dev/null) &disown"#,
-                url.replace('"', "").replace('\'', "").replace(' ', "+")
+                r#"{}
+                
+read -r -d '' url <<'EOF'
+{}
+EOF
+
+_open_url "$url""#,
+                code, url
             );
             Command::new("bash")
                 .arg("-c")
                 .arg(cmd.as_str())
                 .spawn()
-                .map_err(|e| BashSpawnError::new(cmd, e))?;
+                .map_err(|e| BashSpawnError::new(cmd, e))?
+                .wait()?;
             Ok(())
         }