fixed packer --version

chiastolite · Dec 13, 2014 · 8b10e70 · 8b10e70
1 parent 88d4815
commit 8b10e70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -166,6 +166,7 @@ func wrappedMain() int {
 		Commands:   Commands,
 		HelpFunc:   cli.BasicHelpFunc("packer"),
 		HelpWriter: os.Stdout,
+		Version:    Version,
 	}
 
 	exitCode, err := cli.Run()

diff --git a/test/cli.bats b/test/cli.bats
@@ -17,20 +17,20 @@ load test_helper
     [[ "$output" == *"Packer v"* ]]
 
     run packer -v
-    [ "$status" -eq 0 ]
-    [[ "$output" == *"Packer v"* ]]
+    [ "$status" -eq 1 ]
+    [[ "$output" =~ ([0-9]+\.[0-9]+) ]]
 
     run packer --version
-    [ "$status" -eq 0 ]
-    [[ "$output" == *"Packer v"* ]]
+    [ "$status" -eq 1 ]
+    [[ "$output" =~ ([0-9]+\.[0-9]+) ]]
 }
 
 @test "cli: packer version show help" {
     run packer version -h
     [ "$status" -eq 0 ]
-    [[ "$output" == *"usage: packer version"* ]]
+    [[ "$output" == *"Packer v"* ]]
 
     run packer version --help
     [ "$status" -eq 0 ]
-    [[ "$output" == *"usage: packer version"* ]]
+    [[ "$output" == *"Packer v"* ]]
 }