From 7972f3a7eef8efab9835dec7d9e36c462ad0745d Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Sat, 1 Nov 2014 19:59:04 -0700 Subject: [PATCH] fixed osx fuse checks --- cmd/ipfs/{mountutils_darwin.go => mount_darwin.go} | 10 ++++++++-- cmd/ipfs/mount_unix.go | 6 +++++- cmd/ipfs/mountutils_linux.go | 5 ----- 3 files changed, 13 insertions(+), 8 deletions(-) rename cmd/ipfs/{mountutils_darwin.go => mount_darwin.go} (63%) delete mode 100644 cmd/ipfs/mountutils_linux.go diff --git a/cmd/ipfs/mountutils_darwin.go b/cmd/ipfs/mount_darwin.go similarity index 63% rename from cmd/ipfs/mountutils_darwin.go rename to cmd/ipfs/mount_darwin.go index 4b9810a2f..8e84824b4 100644 --- a/cmd/ipfs/mountutils_darwin.go +++ b/cmd/ipfs/mount_darwin.go @@ -1,12 +1,18 @@ package main import ( + "fmt" "runtime" "strings" "syscall" ) -func osxFuseCheck() error { +func init() { + // this is a hack, but until we need to do it another way, this works. + platformFuseChecks = darwinFuseCheckVersion +} + +func darwinFuseCheckVersion() error { // on OSX, check FUSE version. if runtime.GOOS != "darwin" { return nil @@ -17,7 +23,7 @@ func osxFuseCheck() error { return err } - if strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") { + if !strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") { return nil } diff --git a/cmd/ipfs/mount_unix.go b/cmd/ipfs/mount_unix.go index 93f8ce53c..674c99d56 100644 --- a/cmd/ipfs/mount_unix.go +++ b/cmd/ipfs/mount_unix.go @@ -33,7 +33,7 @@ func init() { } func mountCmd(c *commander.Command, inp []string) error { - if err := osxFuseCheck(); err != nil { + if err := platformFuseChecks(); err != nil { return err } @@ -95,3 +95,7 @@ func mountIpns(node *core.IpfsNode, nsdir, fsdir string) <-chan error { return done } + +var platformFuseChecks = func() error { + return nil +} diff --git a/cmd/ipfs/mountutils_linux.go b/cmd/ipfs/mountutils_linux.go deleted file mode 100644 index 00cc70992..000000000 --- a/cmd/ipfs/mountutils_linux.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -func osxFuseCheck() error { - return nil -}