aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Burwell <ben@benburwell.com>2019-07-02 18:21:34 -0400
committerDrew DeVault <sir@cmpwn.com>2019-07-04 10:58:33 -0400
commit1bb1a8015659e0cfde45be9fe9440dbb254680cf (patch)
tree4ee9e875ed33f9d851a71c26d5a721c9ea4e9b59
parent687f1d8c1a31176c3d94e1c4f9049f011cd339ad (diff)
downloadaerc-1bb1a8015659e0cfde45be9fe9440dbb254680cf.tar.gz
Use "open" instead of "xdg-open" on Darwin systems
-rw-r--r--commands/msgview/open.go5
-rw-r--r--doc/aerc.1.scd2
-rw-r--r--lib/open.go12
-rw-r--r--lib/open_darwin.go10
4 files changed, 25 insertions, 4 deletions
diff --git a/commands/msgview/open.go b/commands/msgview/open.go
index d1b32380..d25fa678 100644
--- a/commands/msgview/open.go
+++ b/commands/msgview/open.go
@@ -7,10 +7,10 @@ import (
"io/ioutil"
"mime/quotedprintable"
"os"
- "os/exec"
"strings"
"time"
+ "git.sr.ht/~sircmpwn/aerc/lib"
"git.sr.ht/~sircmpwn/aerc/widgets"
)
@@ -58,8 +58,7 @@ func (_ Open) Execute(aerc *widgets.Aerc, args []string) error {
return
}
- cmd := exec.Command("xdg-open", tmpFile.Name())
- err = cmd.Run()
+ err = lib.OpenFile(tmpFile.Name())
if err != nil {
aerc.PushError(" " + err.Error())
}
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd
index f97d01d3..0b86f750 100644
--- a/doc/aerc.1.scd
+++ b/doc/aerc.1.scd
@@ -122,7 +122,7 @@ message list, the message in the message viewer, etc).
*open*
Saves the current message part in a temporary file and opens it
- with xdg-open.
+ with the system handler.
*pipe* <cmd>
Downloads and pipes the current message part into the given shell command,
diff --git a/lib/open.go b/lib/open.go
new file mode 100644
index 00000000..ad6533e1
--- /dev/null
+++ b/lib/open.go
@@ -0,0 +1,12 @@
+// +build !darwin
+
+package lib
+
+import (
+ "os/exec"
+)
+
+func OpenFile(filename string) error {
+ cmd := exec.Command("xdg-open", filename)
+ return cmd.Run()
+}
diff --git a/lib/open_darwin.go b/lib/open_darwin.go
new file mode 100644
index 00000000..0ffd9a16
--- /dev/null
+++ b/lib/open_darwin.go
@@ -0,0 +1,10 @@
+package lib
+
+import (
+ "os/exec"
+)
+
+func OpenFile(filename string) error {
+ cmd := exec.Command("open", filename)
+ return cmd.Run()
+}