On Tue, Nov 30, 2010 at 3:02 PM, Jacob Helwig <[email protected]> wrote: > Forget a linebreak in the subject there somewhere?
Somewhere :) > > Looks like there's a few places where it's trying _extra_ hard to ensure > directories where it really only need to try, but that's more a > statement about the install.rb in general. > > It might not hurt to come through here with a broom at some point to see > what all can be cleaned up. Absolutely. I decided to ignore the code smells and just follow the same (kind of horrific) style as the script already implemented, as there is more cleanup work that should definitely be done in the future. > > This looks good to me, provided a couple of newlines end up inserted > into the commit message before it's applied. > > +1 from me, FWIW > > -- > Jacob Helwig > > On Tue, 30 Nov 2010 14:24:37 -0800, Nigel Kersten wrote: >> >> >> Signed-off-by: Nigel Kersten <[email protected]> >> --- >> install.rb | 45 ++++++++++++++++++++++++++++++++++++++------- >> 1 files changed, 38 insertions(+), 7 deletions(-) >> >> diff --git a/install.rb b/install.rb >> index f7541c8..7627a8d 100755 >> --- a/install.rb >> +++ b/install.rb >> @@ -79,6 +79,7 @@ def glob(list) >> end >> >> # Set these values to what you want installed. >> +configs = glob(%w{conf/auth.conf}) >> sbins = glob(%w{sbin/*}) >> bins = glob(%w{bin/*}) >> rdoc = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG >> TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ } >> @@ -87,6 +88,14 @@ man = glob(%w{man/man[0-9]/*}) >> libs = glob(%w{lib/**/*.rb lib/**/*.py lib/puppet/util/command_line/*}) >> tests = glob(%w{test/**/*.rb}) >> >> +def do_configs(configs, target, strip = 'conf/') >> + Dir.mkdir(target) unless File.directory? target >> + configs.each do |cf| >> + ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, '')) >> + File.install(cf, ocf, 0644, true) >> + end >> +end >> + >> def do_bins(bins, target, strip = 's?bin/') >> Dir.mkdir(target) unless File.directory? target >> bins.each do |bf| >> @@ -157,6 +166,8 @@ end >> def prepare_installation >> $operatingsystem = Facter["operatingsystem"].value >> >> + InstallOptions.configs = true >> + >> # Only try to do docs if we're sure they have rdoc >> if $haverdoc >> InstallOptions.rdoc = true >> @@ -193,9 +204,15 @@ def prepare_installation >> opts.on('--[no-]tests', 'Prevents the execution of unit tests.', >> 'Default on.') do |ontest| >> InstallOptions.tests = ontest >> end >> + opts.on('--[no-]configs', 'Prevents the installation of config files', >> 'Default off.') do |ontest| >> + InstallOptions.configs = ontest >> + end >> opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', >> 'Default essentially /') do |destdir| >> InstallOptions.destdir = destdir >> end >> + opts.on('--configdir[=OPTIONAL]', 'Installation directory for config >> files', 'Default /etc/puppet') do |configdir| >> + InstallOptions.configdir = configdir >> + end >> opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', >> 'overrides Config::CONFIG["bindir"]') do |bindir| >> InstallOptions.bindir = bindir >> end >> @@ -209,15 +226,17 @@ def prepare_installation >> InstallOptions.mandir = mandir >> end >> opts.on('--quick', 'Performs a quick installation. Only the', >> 'installation is done.') do |quick| >> - InstallOptions.rdoc = false >> - InstallOptions.ri = false >> - InstallOptions.tests = false >> + InstallOptions.rdoc = false >> + InstallOptions.ri = false >> + InstallOptions.tests = false >> + InstallOptions.configs = true >> end >> opts.on('--full', 'Performs a full installation. All', 'optional >> installation steps are run.') do |full| >> - InstallOptions.rdoc = true >> - InstallOptions.man = true >> - InstallOptions.ri = true >> - InstallOptions.tests = true >> + InstallOptions.rdoc = true >> + InstallOptions.man = true >> + InstallOptions.ri = true >> + InstallOptions.tests = true >> + InstallOptions.configs = true >> end >> opts.separator("") >> opts.on_tail('--help', "Shows this help text.") do >> @@ -243,6 +262,12 @@ def prepare_installation >> Config::CONFIG['sbindir'] = "/usr/sbin" >> end >> >> + if not InstallOptions.configdir.nil? >> + configdir = InstallOptions.configdir >> + else >> + configdir = "/etc/puppet" >> + end >> + >> if not InstallOptions.bindir.nil? >> bindir = InstallOptions.bindir >> else >> @@ -277,22 +302,26 @@ def prepare_installation >> >> # To be deprecated once people move over to using --destdir option >> if (destdir = ENV['DESTDIR']) >> + configdir = "#{destdir}#{configdir}" >> bindir = "#{destdir}#{bindir}" >> sbindir = "#{destdir}#{sbindir}" >> mandir = "#{destdir}#{mandir}" >> sitelibdir = "#{destdir}#{sitelibdir}" >> >> + FileUtils.makedirs(configdir) if InstallOptions.configs >> FileUtils.makedirs(bindir) >> FileUtils.makedirs(sbindir) >> FileUtils.makedirs(mandir) >> FileUtils.makedirs(sitelibdir) >> # This is the new way forward >> elsif (destdir = InstallOptions.destdir) >> + configdir = "#{destdir}#{configdir}" >> bindir = "#{destdir}#{bindir}" >> sbindir = "#{destdir}#{sbindir}" >> mandir = "#{destdir}#{mandir}" >> sitelibdir = "#{destdir}#{sitelibdir}" >> >> + FileUtils.makedirs(configdir) if InstallOptions.configs >> FileUtils.makedirs(bindir) >> FileUtils.makedirs(sbindir) >> FileUtils.makedirs(mandir) >> @@ -303,6 +332,7 @@ def prepare_installation >> >> InstallOptions.tmp_dirs = tmpdirs.compact >> InstallOptions.site_dir = sitelibdir >> + InstallOptions.config_dir = configdir >> InstallOptions.bin_dir = bindir >> InstallOptions.sbin_dir = sbindir >> InstallOptions.lib_dir = libdir >> @@ -459,6 +489,7 @@ prepare_installation >> #build_rdoc(rdoc) if InstallOptions.rdoc >> #build_ri(ri) if InstallOptions.ri >> #build_man(bins, sbins) if InstallOptions.man >> +do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs >> do_bins(sbins, InstallOptions.sbin_dir) >> do_bins(bins, InstallOptions.bin_dir) >> do_libs(libs) >> -- >> 1.7.3.1 >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Puppet Developers" group. >> To post to this group, send email to [email protected]. >> To unsubscribe from this group, send email to >> [email protected]. >> For more options, visit this group at >> http://groups.google.com/group/puppet-dev?hl=en. >> > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.10 (GNU/Linux) > > iQGcBAEBAgAGBQJM9YKYAAoJEHJabXWGiqEBRlsMAJO0wspnjYYI3LyZIbZNMY4/ > sLQIIQoi3CVXQ4jrdlAiyG7oONCtktqoljp5ltdQRR+I/ggQBkdB6dFn4GZuUuNX > FAawBlKvnGorw9OFBx0EX9ZBofvM9V2Q05ns9fATlF0pwFr7LMTjPCpfY9RtN9hA > ynoXjQgaKd99e6jTvo9Oh8Mi6OE44E3xlIZPGZYtovsGHtvZz9/JfhLgejquY1PV > 8MMu4YNZ3g3hcR7Kro3mFZ+b3tkzgdYqWevwRqbblRXKTuEnJRVaFirZY7U/Hy3l > psyd/VwtCJZoAgnekbynF4+iwZ5wqCLaz02MqmtBvhtRlek5UXNZomkx5UqGmjr0 > xrrIv3oDswgJTEB43eXZUlujfJo86QNHsNg2HSLzify4chuosKjIqIi/cJtNmkYo > SZ5uYdTElnpSM0xm0DLPYHYTPqUpPRN3LxMZr+AWldYVMGp3HT0u1x/XBSE1j7+U > tT/VRLiXjmW76m0l67X/TYvVorXNg1S4XgzDiAorBw== > =Awkf > -----END PGP SIGNATURE----- > > -- Nigel Kersten - Puppet Labs - http://www.puppetlabs.com -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
