transitioned ipfs2 -> ipfs

2025-06-04 13:07:46 +08:00 · 2014-11-18 02:39:48 -08:00
parent ad3f3e003f
commit 5aaa45db9a
38 changed files with 4 additions and 4 deletions
--- a/cmd/ipfs2/.gitignore
+++ b/cmd/ipfs2/.gitignore
--- a/cmd/ipfs2/Makefile
+++ b/cmd/ipfs2/Makefile
--- a/cmd/ipfs2/README.md
+++ b/cmd/ipfs2/README.md
--- a/cmd/ipfs2/daemon.go
+++ b/cmd/ipfs2/daemon.go
@ -10,8 +10,8 @@ import (
 	cmds "github.com/jbenet/go-ipfs/commands"
 	cmdsHttp "github.com/jbenet/go-ipfs/commands/http"
 	core "github.com/jbenet/go-ipfs/core"
-	commands "github.com/jbenet/go-ipfs/core/commands2"
+	commands "github.com/jbenet/go-ipfs/core/commands"
-	daemon "github.com/jbenet/go-ipfs/daemon2"
+	daemon "github.com/jbenet/go-ipfs/core/daemon"
 	util "github.com/jbenet/go-ipfs/util"
 	"github.com/jbenet/go-ipfs/util/debugerror"
 )
--- a/cmd/ipfs2/equinox.yaml
+++ b/cmd/ipfs2/equinox.yaml
--- a/cmd/ipfs2/init.go
+++ b/cmd/ipfs2/init.go
--- a/cmd/ipfs2/ipfs.go
+++ b/cmd/ipfs2/ipfs.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	cmds "github.com/jbenet/go-ipfs/commands"
-	commands "github.com/jbenet/go-ipfs/core/commands2"
+	commands "github.com/jbenet/go-ipfs/core/commands"
 )
 // This is the CLI root, used for executing commands accessible to CLI clients.
--- a/cmd/ipfs2/ipfsHandler.go
+++ b/cmd/ipfs2/ipfsHandler.go
--- a/cmd/ipfs2/main.go
+++ b/cmd/ipfs2/main.go
@ -19,7 +19,7 @@ import (
 	cmdsHttp "github.com/jbenet/go-ipfs/commands/http"
 	config "github.com/jbenet/go-ipfs/config"
 	core "github.com/jbenet/go-ipfs/core"
-	daemon "github.com/jbenet/go-ipfs/daemon2"
+	daemon "github.com/jbenet/go-ipfs/core/daemon"
 	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 	"github.com/jbenet/go-ipfs/util/debugerror"
--- a/cmd/ipfs2/main_test.go
+++ b/cmd/ipfs2/main_test.go
--- a/cmd/ipfs2/tour.go
+++ b/cmd/ipfs2/tour.go
--- a/cmd/ipfs2/tour_test.go
+++ b/cmd/ipfs2/tour_test.go
--- a/core/commands2/add.go
+++ b/core/commands2/add.go
--- a/core/commands2/block.go
+++ b/core/commands2/block.go
--- a/core/commands2/bootstrap.go
+++ b/core/commands2/bootstrap.go
--- a/core/commands2/cat.go
+++ b/core/commands2/cat.go
--- a/core/commands2/commands.go
+++ b/core/commands2/commands.go
--- a/core/commands2/config.go
+++ b/core/commands2/config.go
--- a/core/commands2/diag.go
+++ b/core/commands2/diag.go
--- a/core/commands2/diag_test.go
+++ b/core/commands2/diag_test.go
--- a/core/commands2/id.go
+++ b/core/commands2/id.go
--- a/core/commands2/internal/slice_util.go
+++ b/core/commands2/internal/slice_util.go
--- a/core/commands2/log.go
+++ b/core/commands2/log.go
--- a/core/commands2/ls.go
+++ b/core/commands2/ls.go
--- a/core/commands2/mount_darwin.go
+++ b/core/commands2/mount_darwin.go
--- a/core/commands2/mount_unix.go
+++ b/core/commands2/mount_unix.go
--- a/core/commands2/mount_windows.go
+++ b/core/commands2/mount_windows.go
--- a/core/commands2/name.go
+++ b/core/commands2/name.go
--- a/core/commands2/object.go
+++ b/core/commands2/object.go
--- a/core/commands2/pin.go
+++ b/core/commands2/pin.go
--- a/core/commands2/publish.go
+++ b/core/commands2/publish.go
--- a/core/commands2/refs.go
+++ b/core/commands2/refs.go
--- a/core/commands2/resolve.go
+++ b/core/commands2/resolve.go
--- a/core/commands2/root.go
+++ b/core/commands2/root.go
--- a/core/commands2/swarm.go
+++ b/core/commands2/swarm.go
--- a/core/commands2/update.go
+++ b/core/commands2/update.go
--- a/core/commands2/version.go
+++ b/core/commands2/version.go
--- a/core/daemon/daemon.go
+++ b/core/daemon/daemon.go