aboutsummaryrefslogtreecommitdiffstats
path: root/browser.go
diff options
context:
space:
mode:
authorDave Cheney2014-07-10 17:40:06 +1000
committerDave Cheney2014-07-10 17:40:06 +1000
commit69832124a7731c2457fd9cd135cb8d718535aa6e (patch)
tree8168dd95a84c9c4d5462a46e91ef905eedb140e6 /browser.go
parent59c20acf66768ad817536bfc5f8fee58c316071f (diff)
downloadbrowser-69832124a7731c2457fd9cd135cb8d718535aa6e.tar.bz2
Trying to make OpenFile/Reader on linux more reliable.
Diffstat (limited to 'browser.go')
-rw-r--r--browser.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/browser.go b/browser.go
index 4b922ee..bc312f5 100644
--- a/browser.go
+++ b/browser.go
@@ -7,11 +7,16 @@ import (
"fmt"
"io"
"io/ioutil"
+ "path/filepath"
)
// OpenFile opens new browser window for the file path.
func OpenFile(path string) error {
- return openBrowser(path)
+ path, err := filepath.Abs(path)
+ if err != nil {
+ return err
+ }
+ return OpenURL("file://" + path)
}
// OpenReader consumes the contents of r and presents the
@@ -28,9 +33,7 @@ func OpenReader(r io.Reader) error {
if err := f.Close(); err != nil {
return fmt.Errorf("browser: caching temporary file failed: %v", err)
}
-
- //defer os.Remove(f.Name())
- return openBrowser(f.Name())
+ return OpenFile(f.Name())
}
// OpenURL opens a new browser window pointing to url.