fixed osx fuse checks

This commit is contained in:
Juan Batiz-Benet 2014-11-01 19:59:04 -07:00
parent e7a5dc0056
commit 7972f3a7ee
3 changed files with 13 additions and 8 deletions

View File

@ -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
}

View File

@ -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
}

View File

@ -1,5 +0,0 @@
package main
func osxFuseCheck() error {
return nil
}