commit 8d618ca855e9aa4f09073040490cb5ca769b7142
author Jenkins <jenkins@review.openstack.org> Thu Jun 28 14:04:20 2012 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jun 28 14:04:20 2012 +0000
tree c89e723d370b5a246c3f90c37e5a6f405e922d00
parent c4cd4140d3bb64a02321918df2f0f9258c6c4148
parent 1f8efd93d9e28cee2caf72267335126954bbb45e

Merge "fix syntax error in the if test"

tools/xen/scripts/install-os-vpx.sh

diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh
index 7f2f3e6..241296b 100755
--- a/tools/xen/scripts/install-os-vpx.sh
+++ b/tools/xen/scripts/install-os-vpx.sh
@@ -19,12 +19,7 @@
 
 set -eux
 
-if [ -a /etc/xensource-inventory]
-then
-    . /etc/xensource-inventory
-else
-    . /etc/xcp/inventory
-fi
+[[ -f "/etc/xensource-inventory" ]] && source "/etc/xensource-inventory" || source "/etc/xcp/inventory"
 
 NAME="XenServer OpenStack VPX"
 DATA_VDI_SIZE="500MiB"