From ef83cfb3ff9d12e22653e0b02d7f14db2d1b7605 Mon Sep 17 00:00:00 2001 From: "Sean P. McDonald" Date: Thu, 19 May 2016 10:06:37 -0700 Subject: [PATCH] (MCO-763) Move prepare_installation to run first prepare_installation does not depend on any variable definitions before it, so it needs to be moved to the first action taken in install.rb to avoid situations where the script is using install options before they are defined --- install.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.rb b/install.rb index 32f5452a..902d5e8b 100755 --- a/install.rb +++ b/install.rb @@ -296,6 +296,7 @@ def install_binfile(from, op_file, target) # Change directory into the mcollective root so we don't get the wrong files for install. cd File.dirname(__FILE__) do + prepare_installation # Set these values to what you want installed. configs = glob(%w{etc/*.dist}) erbs = glob(%w{etc/*.erb}) @@ -304,6 +305,7 @@ def install_binfile(from, op_file, target) rdoc = glob(%w{bin/* lib/**/*.rb README* }) libs = glob(%w{lib/**/*}) plugins = glob(%w{plugins/**/*}) + if WINDOWS && InstallOptions.batch_files if InstallOptions.service_files windows_bins = glob(%w{ext/windows/*.bat ext/windows/*.rb}) @@ -313,8 +315,6 @@ def install_binfile(from, op_file, target) end check_prereqs - prepare_installation - build_rdoc(rdoc) if InstallOptions.rdoc do_configs(configs, InstallOptions.configdir, 'etc/|\.dist') if InstallOptions.configs do_configs(erbs, InstallOptions.configdir) if InstallOptions.configs