Exit with 2 instead of 0 in cases of invalid command line arguments

8 files changed, 19 insertions, 14 deletions

diff --git a/cmd/hdfs/chmod.go b/cmd/hdfs/chmod.go
index c55c77e..9ef3c3f 100644
--- a/cmd/hdfs/chmod.go
+++ b/cmd/hdfs/chmod.go
@@ -8,7 +8,7 @@ import (
 
 func chmod(args []string, recursive bool) {
 	if len(args) < 2 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	mode, err := strconv.ParseUint(args[0], 8, 32)
diff --git a/cmd/hdfs/chown.go b/cmd/hdfs/chown.go
index 99adf9e..4d235ed 100644
--- a/cmd/hdfs/chown.go
+++ b/cmd/hdfs/chown.go
@@ -8,7 +8,7 @@ import (
 
 func chown(args []string, recursive bool) {
 	if len(args) < 2 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	parts := strings.SplitN(args[0], ":", 2)
diff --git a/cmd/hdfs/du.go b/cmd/hdfs/du.go
index 6a35ccd..34930fb 100644
--- a/cmd/hdfs/du.go
+++ b/cmd/hdfs/du.go
@@ -12,7 +12,7 @@ import (
 
 func du(args []string, summarize, humanReadable bool) {
 	if len(args) == 0 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	expanded, client, err := getClientAndExpandedPaths(args)
diff --git a/cmd/hdfs/get.go b/cmd/hdfs/get.go
index 5fb5332..d109bc4 100644
--- a/cmd/hdfs/get.go
+++ b/cmd/hdfs/get.go
@@ -11,7 +11,7 @@ import (
 
 func get(args []string) {
 	if len(args) == 0 || len(args) > 2 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	sources, nn, err := normalizePaths(args[0:1])
@@ -68,7 +68,7 @@ func get(args []string) {
 
 func getmerge(args []string, addNewlines bool) {
 	if len(args) != 2 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	dest := args[1]
diff --git a/cmd/hdfs/main.go b/cmd/hdfs/main.go
index b9106b8..e5d45eb 100755
--- a/cmd/hdfs/main.go
+++ b/cmd/hdfs/main.go
@@ -98,7 +98,7 @@ func init() {
 
 func main() {
 	if len(os.Args) < 2 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	command := os.Args[1]
@@ -170,8 +170,13 @@ func fatal(msg ...interface{}) {
 }
 
 func fatalWithUsage(msg ...interface{}) {
-	msg = append(msg, "\n"+usage)
-	fatal(msg...)
+	if len(msg) > 0 {
+		fmt.Fprintln(os.Stderr, append(msg, "\n"+usage)...)
+	} else {
+		fmt.Fprintln(os.Stderr, usage)
+	}
+
+	os.Exit(2)
 }
 
 func getClient(namenode string) (*hdfs.Client, error) {
diff --git a/cmd/hdfs/mkdir.go b/cmd/hdfs/mkdir.go
index 11ce1bf..e1a806b 100644
--- a/cmd/hdfs/mkdir.go
+++ b/cmd/hdfs/mkdir.go
@@ -11,7 +11,7 @@ func mkdir(paths []string, all bool) {
 	}
 
 	if len(paths) == 0 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	client, err := getClient(nn)
diff --git a/cmd/hdfs/put.go b/cmd/hdfs/put.go
index ee72c2a..1f831a3 100644
--- a/cmd/hdfs/put.go
+++ b/cmd/hdfs/put.go
@@ -11,7 +11,7 @@ import (
 
 func put(args []string) {
 	if len(args) != 2 {
-		printHelp()
+		fatalWithUsage()
 	}
 
 	dests, nn, err := normalizePaths(args[1:])
diff --git a/cmd/hdfs/touch.go b/cmd/hdfs/touch.go
index 9dbc6a2..14a6846 100644
--- a/cmd/hdfs/touch.go
+++ b/cmd/hdfs/touch.go
@@ -6,15 +6,15 @@ import (
 )
 
 func touch(paths []string, noCreate bool) {
+	if len(paths) == 0 {
+		fatalWithUsage()
+	}
+
 	paths, nn, err := normalizePaths(paths)
 	if err != nil {
 		fatal(err)
 	}
 
-	if len(paths) == 0 {
-		printHelp()
-	}
-
 	client, err := getClient(nn)
 	if err != nil {
 		fatal(err)