Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
7972f3a7
Commit
7972f3a7
authored
Nov 01, 2014
by
Juan Batiz-Benet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed osx fuse checks
parent
e7a5dc00
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
cmd/ipfs/mount_darwin.go
cmd/ipfs/mount_darwin.go
+8
-2
cmd/ipfs/mount_unix.go
cmd/ipfs/mount_unix.go
+5
-1
cmd/ipfs/mountutils_linux.go
cmd/ipfs/mountutils_linux.go
+0
-5
No files found.
cmd/ipfs/mount
utils
_darwin.go
→
cmd/ipfs/mount_darwin.go
View file @
7972f3a7
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
}
...
...
cmd/ipfs/mount_unix.go
View file @
7972f3a7
...
...
@@ -33,7 +33,7 @@ func init() {
}
func
mountCmd
(
c
*
commander
.
Command
,
inp
[]
string
)
error
{
if
err
:=
osx
FuseCheck
();
err
!=
nil
{
if
err
:=
platform
FuseCheck
s
();
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
}
cmd/ipfs/mountutils_linux.go
deleted
100644 → 0
View file @
e7a5dc00
package
main
func
osxFuseCheck
()
error
{
return
nil
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment