Updated install script to include all bin files.

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@383 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 6 insertions, 4 deletions

diff --git a/install.rb b/install.rb
index 4a68e4250..d36857fbd 100644
--- a/install.rb
+++ b/install.rb
@@ -51,8 +51,8 @@ def glob(list)
 end

 

   # Set these values to what you want installed.

-bins  = %w{bin/puppeter}

-rdoc  = glob(%w{bin/puppeter lib/**/*.rb README ChangeLog Install}).reject { |e| e=~ /\.(bat|cmd)$/ }

+bins  = glob(%w{bin/**/*})

+rdoc  = glob(%w{bin/**/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }

 ri    = glob(%w(bin/**/*.rb lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }

 libs  = glob(%w{lib/**/*.rb})

 tests = glob(%w{tests/**/*.rb})

@@ -154,7 +154,7 @@ end
 #

 def build_rdoc(files)

   r = RDoc::RDoc.new

-  r.document(["--main", "README", "--title", "Diff::LCS -- A Diff Algorithm",

+  r.document(["--main", "README", "--title", "Puppet -- Site Configuration Management",

               "--line-numbers"] + files)

 

 rescue RDoc::RDocError => e

@@ -165,11 +165,13 @@ end
 

 def build_ri(files)

   ri = RDoc::RDoc.new

-  ri.document(["--ri-site", "--merge"] + files)

+  #ri.document (["--ri-site", "--merge"] + files)

+  ri.document(["--ri-site"] + files)

 rescue RDoc::RDocError => e

   $stderr.puts e.message

 rescue Exception => e

   $stderr.puts "Couldn't build Ri documentation\n#{e.message}"

+  $stderr.puts "Continuing with install..."

 end

 

 def run_tests(test_list)