fixed osx fuse checks
Juan Batiz-Benet committed
Nov 1, 2014 at 19:59 UTC
7972f3a7eef8efab9835dec7d9e36c462ad0745d
3 files changed
+13
-8
cmd/ipfs/mount_darwin.go
renamed
+8
-2
@@ -1,12 +1,18 @@
1
package main
2
3
import (
4
+ "fmt"
5
"runtime"
6
"strings"
7
"syscall"
8
)
9
9
-func osxFuseCheck() error {
10
+func init() {
11
+ // this is a hack, but until we need to do it another way, this works.
12
+ platformFuseChecks = darwinFuseCheckVersion
13
+}
14
+
15
+func darwinFuseCheckVersion() error {
16
// on OSX, check FUSE version.
17
if runtime.GOOS != "darwin" {
18
return nil
@@ -17,7 +23,7 @@ func osxFuseCheck() error {
23
return err
24
}
25
20
- if strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") {
26
+ if !strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") {
27
return nil
28
}
29
cmd/ipfs/mount_unix.go
+5
-1
@@ -33,7 +33,7 @@ func init() {
33
}
34
35
func mountCmd(c *commander.Command, inp []string) error {
36
- if err := osxFuseCheck(); err != nil {
36
+ if err := platformFuseChecks(); err != nil {
37
return err
38
}
39
@@ -95,3 +95,7 @@ func mountIpns(node *core.IpfsNode, nsdir, fsdir string) <-chan error {
95
96
return done
97
}
98
+
99
+var platformFuseChecks = func() error {
100
+ return nil
101
+}
cmd/ipfs/mountutils_linux.go
deleted
-5
@@ -1,5 +0,0 @@
1
-package main
2
-
3
-func osxFuseCheck() error {
4
- return nil
5
-}