Merge branch 'ticket/2.6.next/5724-deprecate_DESTDIR_for_install.rb' of git://github.com/elutfall/puppet into 2.6.next

* 'ticket/2.6.next/5724-deprecate_DESTDIR_for_install.rb' of git://github.com/elutfall/puppet:
  (5724) Prep for deprecation of DESTDIR
  Refactoring duplicate code and logic in prep for DESTDIR deprecation.

1 files changed, 20 insertions, 25 deletions

diff --git a/install.rb b/install.rb
index 7627a8d11..e8755e07a 100755
--- a/install.rb
+++ b/install.rb
@@ -300,34 +300,29 @@ def prepare_installation
     mandir = Config::CONFIG['mandir']
   end
 
-  # 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)
-    FileUtils.makedirs(sitelibdir)
+  if not InstallOptions.destdir.nil?
+    destdir = InstallOptions.destdir
+  # To be deprecated once people move over to using --destdir option
+  elsif ENV['DESTDIR'] != nil?
+    destdir = ENV['DESTDIR']
+    warn "DESTDIR is deprecated. Use --destdir instead."
+  else
+    destdir = ''
   end
 
+  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)
+
   tmpdirs << bindir
 
   InstallOptions.tmp_dirs = tmpdirs.compact