From e4ee16fac1b99e1bf0a2d79c743910cd5f34f54b Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sat, 5 Jul 2014 22:07:20 -0700
Subject: [PATCH] cat and ls multifile

---
 cli/Makefile |  3 +++
 cli/cat.go   | 24 +++++++++++++-----------
 cli/ls.go    | 26 ++++++++++++++------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/cli/Makefile b/cli/Makefile
index fcc01c36a..3771940c3 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -3,3 +3,6 @@ all: build
 build:
 	go build
 	mv cli ipfs
+
+install: build
+	cp ipfs /usr/local/bin/ipfs
diff --git a/cli/cat.go b/cli/cat.go
index 73d6a25d8..1938bed76 100644
--- a/cli/cat.go
+++ b/cli/cat.go
@@ -25,22 +25,24 @@ func catCmd(c *commander.Command, inp []string) error {
 		return nil
 	}
 
-	// for now only hashes, no path resolution
-	h, err := mh.FromB58String(inp[0])
-	if err != nil {
-		return err
-	}
-
 	n, err := localNode()
 	if err != nil {
 		return err
 	}
 
-	nd, err := n.GetDagNode(u.Key(h))
-	if err != nil {
-		return err
-	}
+	for _, fn := range inp {
+		// for now only hashes, no path resolution
+		h, err := mh.FromB58String(fn)
+		if err != nil {
+			return err
+		}
 
-	u.POut("%s", nd.Data)
+		nd, err := n.GetDagNode(u.Key(h))
+		if err != nil {
+			return err
+		}
+
+		u.POut("%s", nd.Data)
+	}
 	return nil
 }
diff --git a/cli/ls.go b/cli/ls.go
index bb1621590..ebc7d139c 100644
--- a/cli/ls.go
+++ b/cli/ls.go
@@ -28,24 +28,26 @@ func lsCmd(c *commander.Command, inp []string) error {
 		return nil
 	}
 
-	// for now only hashes, no path resolution
-	h, err := mh.FromB58String(inp[0])
-	if err != nil {
-		return err
-	}
-
 	n, err := localNode()
 	if err != nil {
 		return err
 	}
 
-	nd, err := n.GetDagNode(u.Key(h))
-	if err != nil {
-		return err
-	}
+	for _, fn := range inp {
+		// for now only hashes, no path resolution
+		h, err := mh.FromB58String(fn)
+		if err != nil {
+			return err
+		}
 
-	for _, link := range nd.Links {
-		u.POut("%s %d %s\n", link.Hash.B58String(), link.Size, link.Name)
+		nd, err := n.GetDagNode(u.Key(h))
+		if err != nil {
+			return err
+		}
+
+		for _, link := range nd.Links {
+			u.POut("%s %d %s\n", link.Hash.B58String(), link.Size, link.Name)
+		}
 	}
 	return nil
 }