From dcd0bac8e5594044bac5afdc0276d3bb13b5c69b Mon Sep 17 00:00:00 2001 From: verokarhu Date: Thu, 31 Jul 2014 20:04:05 +0300 Subject: [PATCH 1/2] disable mount command on windows for now --- cmd/ipfs/mount.go | 2 ++ cmd/ipfs/mount_windows.go | 21 +++++++++++++++++++++ fuse/readonly/readonly.go | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 cmd/ipfs/mount_windows.go diff --git a/cmd/ipfs/mount.go b/cmd/ipfs/mount.go index c0f529e53..dbf1fce0e 100644 --- a/cmd/ipfs/mount.go +++ b/cmd/ipfs/mount.go @@ -1,3 +1,5 @@ +// +build !windows + package main import ( diff --git a/cmd/ipfs/mount_windows.go b/cmd/ipfs/mount_windows.go new file mode 100644 index 000000000..a330cb899 --- /dev/null +++ b/cmd/ipfs/mount_windows.go @@ -0,0 +1,21 @@ +package main + +import ( + "fmt" + "github.com/gonuts/flag" + "github.com/jbenet/commander" +) + +var cmdIpfsMount = &commander.Command{ + UsageLine: "mount", + Short: "Mount an ipfs read-only mountpoint.", + Long: `Not yet implemented on windows.`, + Run: mountCmd, + Flag: *flag.NewFlagSet("ipfs-mount", flag.ExitOnError), +} + +func mountCmd(c *commander.Command, inp []string) error { + fmt.Printf("not implemented yet\n") + + return nil +} diff --git a/fuse/readonly/readonly.go b/fuse/readonly/readonly.go index 299003592..6e900d077 100644 --- a/fuse/readonly/readonly.go +++ b/fuse/readonly/readonly.go @@ -1,5 +1,7 @@ // A Go mirror of libfuse's hello.c +// +build !windows + package readonly import ( From fef46e44f858f072840953db281e902fda2d0029 Mon Sep 17 00:00:00 2001 From: verokarhu Date: Fri, 1 Aug 2014 00:51:43 +0300 Subject: [PATCH 2/2] mount command on windows returns an error instead of nil and adjusted unix-only code --- cmd/ipfs/{mount.go => mount_unix.go} | 2 +- cmd/ipfs/mount_windows.go | 6 ++---- fuse/readonly/{readonly.go => readonly_unix.go} | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) rename cmd/ipfs/{mount.go => mount_unix.go} (96%) rename fuse/readonly/{readonly.go => readonly_unix.go} (99%) diff --git a/cmd/ipfs/mount.go b/cmd/ipfs/mount_unix.go similarity index 96% rename from cmd/ipfs/mount.go rename to cmd/ipfs/mount_unix.go index dbf1fce0e..2f08b77b8 100644 --- a/cmd/ipfs/mount.go +++ b/cmd/ipfs/mount_unix.go @@ -1,4 +1,4 @@ -// +build !windows +// +build linux darwin freebsd package main diff --git a/cmd/ipfs/mount_windows.go b/cmd/ipfs/mount_windows.go index a330cb899..8c3daf8e6 100644 --- a/cmd/ipfs/mount_windows.go +++ b/cmd/ipfs/mount_windows.go @@ -1,7 +1,7 @@ package main import ( - "fmt" + "errors" "github.com/gonuts/flag" "github.com/jbenet/commander" ) @@ -15,7 +15,5 @@ var cmdIpfsMount = &commander.Command{ } func mountCmd(c *commander.Command, inp []string) error { - fmt.Printf("not implemented yet\n") - - return nil + return errors.New("mount not yet implemented on windows") } diff --git a/fuse/readonly/readonly.go b/fuse/readonly/readonly_unix.go similarity index 99% rename from fuse/readonly/readonly.go rename to fuse/readonly/readonly_unix.go index 6e900d077..c5ea97c78 100644 --- a/fuse/readonly/readonly.go +++ b/fuse/readonly/readonly_unix.go @@ -1,6 +1,6 @@ // A Go mirror of libfuse's hello.c -// +build !windows +// +build linux darwin freebsd package readonly