From baa1d63ef3fe2648eb4401a184d50b1df60b0aed Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 10 Feb 2011 18:16:18 +0100 Subject: [PATCH] Changed install.sh to use another way of creating arrays Now we don't need to specify the array index so renumbering is not needed when adding new directories --- install.sh | 115 ++++++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 55 deletions(-) diff --git a/install.sh b/install.sh index 2d37ab91ff..e11d90171a 100755 --- a/install.sh +++ b/install.sh @@ -210,63 +210,68 @@ fi # FILE DEFINITION, WHAT IS GOING TO BE INSTALLED AND WHERE #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- +INSTALL_FILES=( + BIN_FILES:$BIN_LOCATION + INCLUDE_FILES:$INCLUDE_LOCATION + LIB_FILES:$LIB_LOCATION + RUBY_LIB_FILES:$LIB_LOCATION/ruby + RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula + MADS_LIB_FILES:$LIB_LOCATION/mads + IM_PROBES_FILES:$VAR_LOCATION/remotes/im + IM_PROBES_KVM_FILES:$VAR_LOCATION/remotes/im/kvm.d + IM_PROBES_XEN_FILES:$VAR_LOCATION/remotes/im/xen.d + VMM_SSH_KVM_SCRIPTS:$VAR_LOCATION/remotes/vmm/kvm + VMM_SSH_XEN_SCRIPTS:$VAR_LOCATION/remotes/vmm/xen + IM_PROBES_FILES:$LIB_LOCATION/remotes/im + IM_PROBES_KVM_FILES:$LIB_LOCATION/remotes/im/kvm.d + IM_PROBES_XEN_FILES:$LIB_LOCATION/remotes/im/xen.d + VMM_SSH_KVM_SCRIPTS:$LIB_LOCATION/remotes/vmm/kvm + VMM_SSH_XEN_SCRIPTS:$LIB_LOCATION/remotes/vmm/xen + NFS_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/nfs + SSH_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/ssh + DUMMY_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/dummy + LVM_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/lvm + EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples + TM_EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples/tm + HOOK_SHARE_FILES:$SHARE_LOCATION/hooks + COMMON_CLOUD_LIB_FILES:$LIB_LOCATION/ruby/cloud + ECO_LIB_FILES:$LIB_LOCATION/ruby/cloud/econe + ECO_LIB_VIEW_FILES:$LIB_LOCATION/ruby/cloud/econe/views + ECO_BIN_FILES:$BIN_LOCATION + OCCI_LIB_FILES:$LIB_LOCATION/ruby/cloud/occi + OCCI_BIN_FILES:$BIN_LOCATION + MAN_FILES:$MAN_LOCATION +) -INSTALL_FILES[0]="BIN_FILES:$BIN_LOCATION" -INSTALL_FILES[1]="INCLUDE_FILES:$INCLUDE_LOCATION" -INSTALL_FILES[2]="LIB_FILES:$LIB_LOCATION" -INSTALL_FILES[3]="RUBY_LIB_FILES:$LIB_LOCATION/ruby" -INSTALL_FILES[4]="RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula" -INSTALL_FILES[5]="MADS_LIB_FILES:$LIB_LOCATION/mads" -INSTALL_FILES[6]="IM_PROBES_FILES:$VAR_LOCATION/remotes/im" -INSTALL_FILES[7]="IM_PROBES_KVM_FILES:$VAR_LOCATION/remotes/im/kvm.d" -INSTALL_FILES[8]="IM_PROBES_XEN_FILES:$VAR_LOCATION/remotes/im/xen.d" -INSTALL_FILES[9]="VMM_SSH_KVM_SCRIPTS:$VAR_LOCATION/remotes/vmm/kvm" -INSTALL_FILES[10]="VMM_SSH_XEN_SCRIPTS:$VAR_LOCATION/remotes/vmm/xen" -INSTALL_FILES[11]="IM_PROBES_FILES:$LIB_LOCATION/remotes/im" -INSTALL_FILES[12]="IM_PROBES_KVM_FILES:$LIB_LOCATION/remotes/im/kvm.d" -INSTALL_FILES[13]="IM_PROBES_XEN_FILES:$LIB_LOCATION/remotes/im/xen.d" -INSTALL_FILES[14]="VMM_SSH_KVM_SCRIPTS:$LIB_LOCATION/remotes/vmm/kvm" -INSTALL_FILES[15]="VMM_SSH_XEN_SCRIPTS:$LIB_LOCATION/remotes/vmm/xen" -INSTALL_FILES[16]="NFS_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/nfs" -INSTALL_FILES[17]="SSH_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/ssh" -INSTALL_FILES[18]="DUMMY_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/dummy" -INSTALL_FILES[19]="LVM_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/lvm" -INSTALL_FILES[20]="EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples" -INSTALL_FILES[21]="TM_EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples/tm" -INSTALL_FILES[22]="HOOK_SHARE_FILES:$SHARE_LOCATION/hooks" -INSTALL_FILES[23]="COMMON_CLOUD_LIB_FILES:$LIB_LOCATION/ruby/cloud" -INSTALL_FILES[24]="ECO_LIB_FILES:$LIB_LOCATION/ruby/cloud/econe" -INSTALL_FILES[25]="ECO_LIB_VIEW_FILES:$LIB_LOCATION/ruby/cloud/econe/views" -INSTALL_FILES[26]="ECO_BIN_FILES:$BIN_LOCATION" -INSTALL_FILES[27]="OCCI_LIB_FILES:$LIB_LOCATION/ruby/cloud/occi" -INSTALL_FILES[28]="OCCI_BIN_FILES:$BIN_LOCATION" -INSTALL_FILES[29]="MAN_FILES:$MAN_LOCATION" +INSTALL_CLIENT_FILES=( + COMMON_CLOUD_CLIENT_LIB_FILES:$LIB_LOCATION/ruby/cloud + ECO_LIB_CLIENT_FILES:$LIB_LOCATION/ruby/cloud/econe + ECO_BIN_CLIENT_FILES:$BIN_LOCATION + COMMON_CLOUD_CLIENT_LIB_FILES:$LIB_LOCATION/ruby/cloud + OCCI_LIB_CLIENT_FILES:$LIB_LOCATION/ruby/cloud/occi + OCCI_BIN_CLIENT_FILES:$BIN_LOCATION + CLI_BIN_FILES:$BIN_LOCATION + CLI_LIB_FILES:$LIB_LOCATION/ruby + RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula +) -INSTALL_CLIENT_FILES[0]="COMMON_CLOUD_CLIENT_LIB_FILES:$LIB_LOCATION/ruby/cloud" -INSTALL_CLIENT_FILES[1]="ECO_LIB_CLIENT_FILES:$LIB_LOCATION/ruby/cloud/econe" -INSTALL_CLIENT_FILES[2]="ECO_BIN_CLIENT_FILES:$BIN_LOCATION" -INSTALL_CLIENT_FILES[3]="COMMON_CLOUD_CLIENT_LIB_FILES:$LIB_LOCATION/ruby/cloud" -INSTALL_CLIENT_FILES[4]="OCCI_LIB_CLIENT_FILES:$LIB_LOCATION/ruby/cloud/occi" -INSTALL_CLIENT_FILES[5]="OCCI_BIN_CLIENT_FILES:$BIN_LOCATION" -INSTALL_CLIENT_FILES[6]="CLI_BIN_FILES:$BIN_LOCATION" -INSTALL_CLIENT_FILES[7]="CLI_LIB_FILES:$LIB_LOCATION/ruby" -INSTALL_CLIENT_FILES[8]="RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula" - -INSTALL_ETC_FILES[0]="ETC_FILES:$ETC_LOCATION" -INSTALL_ETC_FILES[1]="VMM_EC2_ETC_FILES:$ETC_LOCATION/vmm_ec2" -INSTALL_ETC_FILES[2]="VMM_SSH_ETC_FILES:$ETC_LOCATION/vmm_ssh" -INSTALL_ETC_FILES[3]="VMM_SH_ETC_FILES:$ETC_LOCATION/vmm_sh" -INSTALL_ETC_FILES[4]="IM_EC2_ETC_FILES:$ETC_LOCATION/im_ec2" -INSTALL_ETC_FILES[5]="TM_NFS_ETC_FILES:$ETC_LOCATION/tm_nfs" -INSTALL_ETC_FILES[6]="TM_SSH_ETC_FILES:$ETC_LOCATION/tm_ssh" -INSTALL_ETC_FILES[7]="TM_DUMMY_ETC_FILES:$ETC_LOCATION/tm_dummy" -INSTALL_ETC_FILES[8]="TM_LVM_ETC_FILES:$ETC_LOCATION/tm_lvm" -INSTALL_ETC_FILES[9]="HM_ETC_FILES:$ETC_LOCATION/hm" -INSTALL_ETC_FILES[10]="AUTH_ETC_FILES:$ETC_LOCATION/auth" -INSTALL_ETC_FILES[11]="ECO_ETC_FILES:$ETC_LOCATION" -INSTALL_ETC_FILES[12]="ECO_ETC_TEMPLATE_FILES:$ETC_LOCATION/ec2query_templates" -INSTALL_ETC_FILES[13]="OCCI_ETC_FILES:$ETC_LOCATION" -INSTALL_ETC_FILES[14]="OCCI_ETC_TEMPLATE_FILES:$ETC_LOCATION/occi_templates" +INSTALL_ETC_FILES=( + ETC_FILES:$ETC_LOCATION + VMM_EC2_ETC_FILES:$ETC_LOCATION/vmm_ec2 + VMM_SSH_ETC_FILES:$ETC_LOCATION/vmm_ssh + VMM_SH_ETC_FILES:$ETC_LOCATION/vmm_sh + IM_EC2_ETC_FILES:$ETC_LOCATION/im_ec2 + TM_NFS_ETC_FILES:$ETC_LOCATION/tm_nfs + TM_SSH_ETC_FILES:$ETC_LOCATION/tm_ssh + TM_DUMMY_ETC_FILES:$ETC_LOCATION/tm_dummy + TM_LVM_ETC_FILES:$ETC_LOCATION/tm_lvm + HM_ETC_FILES:$ETC_LOCATION/hm + AUTH_ETC_FILES:$ETC_LOCATION/auth + ECO_ETC_FILES:$ETC_LOCATION + ECO_ETC_TEMPLATE_FILES:$ETC_LOCATION/ec2query_templates + OCCI_ETC_FILES:$ETC_LOCATION + OCCI_ETC_TEMPLATE_FILES:$ETC_LOCATION/occi_templates +) #------------------------------------------------------------------------------- # Binary files, to be installed under $BIN_LOCATION