Merge pull request #1 from chrislusf/master

sync

1 files changed, 3 insertions, 10 deletions

diff --git a/weed/shell/command_fs_cat.go b/weed/shell/command_fs_cat.go
index 66ced46c5..3db487979 100644
--- a/weed/shell/command_fs_cat.go
+++ b/weed/shell/command_fs_cat.go
@@ -1,7 +1,6 @@
 package shell
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"math"
@@ -24,12 +23,8 @@ func (c *commandFsCat) Name() string {
 func (c *commandFsCat) Help() string {
 	return `stream the file content on to the screen
 
-	fs.cat /dir/
 	fs.cat /dir/file_name
-	fs.cat /dir/file_prefix
-	fs.cat http://<filer_server>:<port>/dir/
 	fs.cat http://<filer_server>:<port>/dir/file_name
-	fs.cat http://<filer_server>:<port>/dir/file_prefix
 `
 }
 
@@ -42,21 +37,19 @@ func (c *commandFsCat) Do(args []string, commandEnv *CommandEnv, writer io.Write
 		return err
 	}
 
-	ctx := context.Background()
-
-	if commandEnv.isDirectory(ctx, filerServer, filerPort, path) {
+	if commandEnv.isDirectory(filerServer, filerPort, path) {
 		return fmt.Errorf("%s is a directory", path)
 	}
 
 	dir, name := filer2.FullPath(path).DirAndName()
 
-	return commandEnv.withFilerClient(ctx, filerServer, filerPort, func(client filer_pb.SeaweedFilerClient) error {
+	return commandEnv.withFilerClient(filerServer, filerPort, func(client filer_pb.SeaweedFilerClient) error {
 
 		request := &filer_pb.LookupDirectoryEntryRequest{
 			Name:      name,
 			Directory: dir,
 		}
-		respLookupEntry, err := client.LookupDirectoryEntry(ctx, request)
+		respLookupEntry, err := filer_pb.LookupEntry(client, request)
 		if err != nil {
 			return err
 		}