projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cee16e7
)
Fix checkout string; bail on error.
author
Carl Hetherington
<cth@carlh.net>
Sat, 3 Oct 2015 18:20:15 +0000
(19:20 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 3 Oct 2015 18:20:15 +0000
(19:20 +0100)
vmbuild
patch
|
blob
|
history
diff --git
a/vmbuild
b/vmbuild
index 3df7840af016b3c061f69e6f3ddcb4a417461eab..bcb74ffd5accfad2bc7f5f3a6c4b110773266b4f 100755
(executable)
--- a/
vmbuild
+++ b/
vmbuild
@@
-1,7
+1,8
@@
#!/bin/bash
#!/bin/bash
+set -e
if [ "$1" == "" -o "$2" == "" ]; then
if [ "$1" == "" -o "$2" == "" ]; then
- echo "Syntax: $0 <target> <
checkout
> [<output-dir>]"
+ echo "Syntax: $0 <target> <
version
> [<output-dir>]"
fi
IFS='-' read distro version bits <<< $1
fi
IFS='-' read distro version bits <<< $1
@@
-22,7
+23,7
@@
fi
nohup vboxheadless --startvm fedora-22-$bits &
sleep 10
ssh -p $port carl@localhost "rm -rf fedora-*"
nohup vboxheadless --startvm fedora-22-$bits &
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
if [ "$output" != "" ]; then
scp -P $port carl@localhost:fedora-22-$bits/* $output/
fi