move OSX specific calls to build tagged files
Jeromy committed
Oct 31, 2014 at 19:46 UTC
c7ef55a450298da42b0ad6c15f597315ee1dbd32
3 files changed
+32
-23
cmd/ipfs/mount_unix.go
-23
@@ -4,9 +4,6 @@ package main
4
5
import (
6
"fmt"
7
- "runtime"
8
- "strings"
9
- "syscall"
7
8
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag"
9
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"
@@ -98,23 +95,3 @@ func mountIpns(node *core.IpfsNode, nsdir, fsdir string) <-chan error {
95
96
return done
97
}
101
-
102
-func osxFuseCheck() error {
103
- // on OSX, check FUSE version.
104
- if runtime.GOOS != "darwin" {
105
- return nil
106
- }
107
-
108
- ov, err := syscall.Sysctl("osxfuse.version.number")
109
- if err != nil {
110
- return err
111
- }
112
-
113
- if strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") {
114
- return nil
115
- }
116
-
117
- return fmt.Errorf("osxfuse version %s not supported.\n%s\n%s", ov,
118
- "Older versions of osxfuse have kernel panic bugs; please upgrade!",
119
- "https://github.com/jbenet/go-ipfs/issues/177")
120
-}
cmd/ipfs/mountutils_darwin.go
new
+27
@@ -0,0 +1,27 @@
1
+package main
2
+
3
+import (
4
+ "runtime"
5
+ "strings"
6
+ "syscall"
7
+)
8
+
9
+func osxFuseCheck() error {
10
+ // on OSX, check FUSE version.
11
+ if runtime.GOOS != "darwin" {
12
+ return nil
13
+ }
14
+
15
+ ov, err := syscall.Sysctl("osxfuse.version.number")
16
+ if err != nil {
17
+ return err
18
+ }
19
+
20
+ if strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") {
21
+ return nil
22
+ }
23
+
24
+ return fmt.Errorf("osxfuse version %s not supported.\n%s\n%s", ov,
25
+ "Older versions of osxfuse have kernel panic bugs; please upgrade!",
26
+ "https://github.com/jbenet/go-ipfs/issues/177")
27
+}
cmd/ipfs/mountutils_linux.go
new
+5
@@ -0,0 +1,5 @@
1
+package main
2
+
3
+func osxFuseCheck() error {
4
+ return nil
5
+}