Merge.

[cdist.git] / vmbuild

diff --git a/vmbuild b/vmbuild
index 1c08f2c3219bdc19a412a933819ba05b96bc6958..197184cbf2629400db9066d85e835152e73b6f6d 100755 (executable)
--- a/vmbuild
+++ b/vmbuild
@@ -1,7 +1,8 @@
 #!/bin/bash
+set -e
 
 if [ "$1" == "" -o "$2" == "" ]; then
-    echo "Syntax: $0 <target> <checkout> [<output-dir>]"
+    echo "Syntax: $0 <target> <version> [<output-dir>]"
     exit 1
 fi
 
@@ -23,7 +24,7 @@ nohup vboxheadless --startvm fedora-22-$bits &
 vbox=$!
 sleep 10
 ssh -p $port carl@localhost "rm -rf fedora-*"
-ssh -p $port carl@localhost cdist -p dcpomatic -c $checkout -t host package
+ssh -p $port carl@localhost cdist -p dcpomatic -c v$checkout -t host package
 if [ "$output" != "" ]; then
     scp -P $port carl@localhost:fedora-22-$bits/* $output/
 fi