Merge pull request #1756 from StefanScherer/fix/packer-minus-minus-version

fixed `packer --version` to show version again

Merge pull request #1756 from StefanScherer/fix/packer-minus-minus-version
fixed `packer --version` to show version again
496d1fe9 · Seth Vargo · 88d48151 · 8b10e70b · 496d1fe9 · 496d1fe9
Commit 496d1fe9 authored Dec 13, 2014 by Seth Vargo
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

main.go main.go +1 -0

test/cli.bats test/cli.bats +6 -6

No files found.
--- 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()

--- a/test/cli.bats
+++ b/test/cli.bats
@@ -17,20 +17,20 @@ load test_helper
    [[ "$output" == *"Packer v"* ]]
    run packer -v
-    [ "$status" -eq 0 ]
+    [ "$status" -eq 1 ]
-    [[ "$output" == *"Packer v"* ]]
+    [[ "$output" =~ ([0-9]+\.[0-9]+) ]]
    run packer --version
-    [ "$status" -eq 0 ]
+    [ "$status" -eq 1 ]
-    [[ "$output" == *"Packer v"* ]]
+    [[ "$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"* ]]
 }