[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 546130d929ce2f82cb074e440993749e74d1f8b4

Micah Anderson micah at riseup.net
Mon Apr 14 02:30:39 UTC 2008


The following commit has been merged in the master branch:
commit eeb3737a7338bfea40ab8da3626abdb37a296f28
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Apr 13 19:04:30 2008 -0400

    Fixes #1148 - replaces #!/usr/bin/ruby with #!/usr/bin/env ruby.
    
    Conflicts:
    
    	bin/pi
    	spec/unit/file_serving/configuration.rb
    	spec/unit/file_serving/configuration/parser.rb
    	spec/unit/indirector/checksum/file.rb
    	spec/unit/indirector/direct_file_server.rb
    	spec/unit/indirector/facts/facter.rb
    	spec/unit/indirector/file.rb
    	spec/unit/indirector/file_server.rb
    	spec/unit/parser/ast/node.rb
    	spec/unit/ral/provider/mount/parsed.rb
    	spec/unit/ral/type/mount.rb

diff --git a/bin/ralsh b/bin/ralsh
index fdf6491..1d00367 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # vim: softtabstop=4 shiftwidth=4 expandtab
 #
 # = Synopsis
diff --git a/lib/puppet/dsl.rb b/lib/puppet/dsl.rb
index 966feaf..714b350 100644
--- a/lib/puppet/dsl.rb
+++ b/lib/puppet/dsl.rb
@@ -1,7 +1,7 @@
 # Just quick mess-around to see what a DSL would look like.
 # 
 # This is what the executable could look like:
-##!/usr/bin/ruby
+##!/usr/bin/env ruby
 #
 #require 'puppet'
 #require 'puppet/dsl'
@@ -23,7 +23,7 @@
 # And here's what an example config could look like:
 #
 
-##!/usr/bin/ruby
+##!/usr/bin/env ruby
 #
 #
 # require 'puppet'
diff --git a/test/lib/stubba.rb b/test/lib/stubba.rb
index eade747..747054c 100644
--- a/test/lib/stubba.rb
+++ b/test/lib/stubba.rb
@@ -1,2 +1,2 @@
 # for backwards compatibility
-require 'mocha'
\ No newline at end of file
+require 'mocha'

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list