From a1d230b88b8ae4e618201928079c0b17c994a3b8 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 8 Sep 2014 10:39:52 +0200 Subject: [PATCH] appliance: fix build.sh for vmware systemvm building and exporting Signed-off-by: Rohit Yadav --- tools/appliance/build.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index d29f95bdef2..50cca56b335 100755 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -26,7 +26,14 @@ else fi build_date=`date +%Y-%m-%d` -branch="master" + +# set fixed or leave empty to use git to determine +branch= + +if [ -z "$branch" ] ; then + branch=`(git name-rev --no-undefined --name-only HEAD 2>/dev/null || echo unknown) | sed -e 's/remotes\/.*\///g'` +fi + rootdir=$PWD # Initialize veewee and dependencies @@ -95,8 +102,8 @@ echo "$appliance exported for VMWare: dist/$appliance-$build_date-$branch-vmware vboxmanage export $machine_uuid --output $appliance-$build_date-$branch-vmware.ovf mv $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware.ovf-orig java -cp convert Convert convert_ovf_vbox_to_esx.xslt $appliance-$build_date-$branch-vmware.ovf-orig $appliance-$build_date-$branch-vmware.ovf -tar -cf $appliance-$build_date-$branch-vmware.ova $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware-disk1.vmdk -rm -f $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware.ovf-orig $appliance-$build_date-$branch-vmware-disk1.vmdk +tar -cf $appliance-$build_date-$branch-vmware.ova $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware-disk[0-9].vmdk +rm -f $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware.ovf-orig $appliance-$build_date-$branch-vmware-disk[0-9].vmdk echo "$appliance exported for VMWare: dist/$appliance-$build_date-$branch-vmware.ova" # Export for HyperV