Browse code

Merge "fix syntax error in the if test"

Jenkins authored on 2012/06/28 23:04:20
Showing 1 changed files
... ...
@@ -19,12 +19,7 @@
19 19
 
20 20
 set -eux
21 21
 
22
-if [ -a /etc/xensource-inventory]
23
-then
24
-    . /etc/xensource-inventory
25
-else
26
-    . /etc/xcp/inventory
27
-fi
22
+[[ -f "/etc/xensource-inventory" ]] && source "/etc/xensource-inventory" || source "/etc/xcp/inventory"
28 23
 
29 24
 NAME="XenServer OpenStack VPX"
30 25
 DATA_VDI_SIZE="500MiB"