1 files changed, 9 insertions, 14 deletions
diff --git a/pkg/server/env.go b/pkg/server/env.go
index eed6e67..1c24f0b 100644
--- a/pkg/server/env.go
+++ b/pkg/server/env.go
@@ -7,9 +7,9 @@ import (
 func init() {
 	newCmd(envSet, "env", "set")
 	newCmd(envGet, "env", "get")
-	newCmd(envShow, "env", "show")
-	newCmd(envShow, "env", "print")
 	newCmd(envUnset, "env", "unset")
+
+	newCmd(envShow, "show", "env")
 }
 
 type env struct {
@@ -77,7 +77,7 @@ func envGet(r *request) {
 	if v, ok := r.c.s.env.get(r.args[0]); ok {
 		r.Print(v)
 	} else {
-		r.Print("no such variable")
+		r.Fatal("no such variable")
 	}
 }
 
@@ -85,20 +85,15 @@ func envUnset(r *request) {
 	r.expect(1)
 
 	if !r.c.s.env.unset(r.args[0]) {
-		r.Print("no such variable")
+		r.Fatal("no such variable")
 	}
 }
 
 func envShow(r *request) {
-	r.expect(0, 1)
+	r.expect(0)
 
-	switch r.argc {
-	case 0:
-		r.c.s.env.each(func (k string, v string) bool {
-			r.Println(k, v)
-			return true
-		})
-	case 1:
-		envGet(r)
-	}
+	r.c.s.env.each(func (k string, v string) bool {
+		r.Println(k, v)
+		return true
+	})
 }