ipfs · Jul 29, 2015 · Jul 29, 2015 · Jul 29, 2015
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/jbenet/goprocess/goprocess.go b/Godeps/_workspace/src/github.com/jbenet/goprocess/goprocess.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/goprocess/goprocess_test.go b/Godeps/_workspace/src/github.com/jbenet/goprocess/goprocess_test.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/goprocess/impl-mutex.go b/Godeps/_workspace/src/github.com/jbenet/goprocess/impl-mutex.go
diff --git a/core/commands/add.go b/core/commands/add.go
@@ -10,7 +10,6 @@ import (
 	cmds "github.com/ipfs/go-ipfs/commands"
 	files "github.com/ipfs/go-ipfs/commands/files"
 	core "github.com/ipfs/go-ipfs/core"
-	coreunix "github.com/ipfs/go-ipfs/core/coreunix"
 	importer "github.com/ipfs/go-ipfs/importer"
 	"github.com/ipfs/go-ipfs/importer/chunk"
 	dag "github.com/ipfs/go-ipfs/merkledag"
@@ -128,10 +127,14 @@ remains to be implemented.
 					node:     n,
 					out:      outChan,
 					progress: progress,
-					wrap:     wrap,
 					hidden:   hidden,
 					trickle:  trickle,
 				}
+
+				if wrap {
+					file = files.NewSliceFile("", []files.File{file})
+				}
+
 				rootnd, err := addParams.addFile(file)
 				if err != nil {
 					res.SetError(err, cmds.ErrNormal)
@@ -247,7 +250,6 @@ type adder struct {
 	node     *core.IpfsNode
 	out      chan interface{}
 	progress bool
-	wrap     bool
 	hidden   bool
 	trickle  bool
 }
@@ -299,18 +301,6 @@ func (params *adder) addFile(file files.File) (*dag.Node, error) {
 		reader = &progressReader{file: file, out: params.out}
 	}
 
-	if params.wrap {
-		p, dagnode, err := coreunix.AddWrapped(params.node, reader, path.Base(file.FileName()))
-		if err != nil {
-			return nil, err
-		}
-		params.out <- &AddedObject{
-			Hash: p,
-			Name: file.FileName(),
-		}
-		return dagnode, nil
-	}
-
 	dagnode, err := add(params.node, reader, params.trickle)
 	if err != nil {
 		return nil, err

diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go
@@ -216,7 +216,7 @@ func doMount(node *core.IpfsNode, fsdir, nsdir string) error {
 	<-done
 
 	if err1 != nil || err2 != nil {
-		log.Infof("error mounting: %s %s", err1, err2)
+		log.Errorf("error mounting: %s %s", err1, err2)
 		if fsmount != nil {
 			fsmount.Unmount()
 		}

diff --git a/core/core.go b/core/core.go
@@ -382,6 +382,13 @@ func (n *IpfsNode) teardown() error {
 		n.Repo,
 	}
 
+	if n.Mounts.Ipfs != nil {
+		closers = append(closers, mount.Closer(n.Mounts.Ipfs))
+	}
+	if n.Mounts.Ipns != nil {
+		closers = append(closers, mount.Closer(n.Mounts.Ipns))
+	}
+
 	// Filesystem needs to be closed before network, dht, and blockservice
 	// so it can use them as its shutting down
 	if n.IpnsFs != nil {

diff --git a/fuse/mount/fuse.go b/fuse/mount/fuse.go
@@ -96,15 +96,15 @@ func (m *mount) unmount() error {
 	if err == nil {
 		return nil
 	}
-	log.Debug("fuse unmount err: %s", err)
+	log.Warningf("fuse unmount err: %s", err)
 
 	// try closing the fuseConn
 	err = m.fuseConn.Close()
 	if err == nil {
 		return nil
 	}
 	if err != nil {
-		log.Debug("fuse conn error: %s", err)
+		log.Warningf("fuse conn error: %s", err)
 	}
 
 	// try mount.ForceUnmountManyTimes

diff --git a/fuse/mount/mount.go b/fuse/mount/mount.go
@@ -3,6 +3,7 @@ package mount
 
 import (
 	"fmt"
+	"io"
 	"os/exec"
 	"runtime"
 	"time"
@@ -33,7 +34,7 @@ type Mount interface {
 // It does so by calling diskutil or fusermount directly.
 func ForceUnmount(m Mount) error {
 	point := m.MountPoint()
-	log.Infof("Force-Unmounting %s...", point)
+	log.Warningf("Force-Unmounting %s...", point)
 
 	var cmd *exec.Cmd
 	switch runtime.GOOS {
@@ -59,7 +60,7 @@ func ForceUnmount(m Mount) error {
 	}()
 
 	select {
-	case <-time.After(2 * time.Second):
+	case <-time.After(7 * time.Second):
 		return fmt.Errorf("umount timeout")
 	case err := <-errc:
 		return err
@@ -81,3 +82,16 @@ func ForceUnmountManyTimes(m Mount, attempts int) error {
 	}
 	return fmt.Errorf("Unmount %s failed after 10 seconds of trying.", m.MountPoint())
 }
+
+type closer struct {
+	M Mount
+}
+
+func (c *closer) Close() error {
+	log.Error(" (c *closer) Close(),", c.M.MountPoint())
+	return c.M.Unmount()
+}
+
+func Closer(m Mount) io.Closer {
+	return &closer{m}
+}
diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh
@@ -267,8 +267,20 @@ test_expect_success "ipfs add -w succeeds" '
 '
 
 test_expect_success "ipfs add -w output looks good" '
-	HASH="QmVJfrqd4ogGZME6LWkkikAGddYgh9dBs2U14DHZZUBk7W" &&
-	echo "added $HASH/hello.txt mountdir/hello.txt" >expected &&
+	HASH1="QmVr26fY1tKyspEJBniVhqxQeEjhF78XerGiqWAwraVLQH" &&
+	HASH2="QmVJfrqd4ogGZME6LWkkikAGddYgh9dBs2U14DHZZUBk7W" &&
+	echo "added $HASH1 mountdir/hello.txt" >expected &&
+	echo "added $HASH2 " >>expected &&
+	test_cmp expected actual
+'
+
+test_expect_success "ipfs add -w succeeds (dir)" '
+	ipfs add -r -w mountdir | tail -n1 >actual
+'
+
+test_expect_success "ipfs add -w output looks good (dir)" '
+	HASH="Qmc341yGztU1o8n3c1u5xTYF3uE3zPPP2NYemG9MKz775V" &&
+	echo "added $HASH " >expected &&
 	test_cmp expected actual
 '