summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lathrop <paul@tertiusfamily.net>2008-03-25 10:30:41 -0700
committerLuke Kanies <luke@madstop.com>2008-03-28 17:43:16 -0500
commit9d30b2603365ee71c8b8cb23635079827189a9c2 (patch)
treedb8efebf1ae44acb7c6d8509d931ca4ac3f27cf2
parent491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff)
downloadpuppet-9d30b2603365ee71c8b8cb23635079827189a9c2.tar.gz
puppet-9d30b2603365ee71c8b8cb23635079827189a9c2.tar.xz
puppet-9d30b2603365ee71c8b8cb23635079827189a9c2.zip
Fixes #1148 - replaces #!/usr/bin/ruby with #!/usr/bin/env ruby.
-rwxr-xr-xbin/pi2
-rwxr-xr-xbin/ralsh2
-rw-r--r--lib/puppet/dsl.rb4
-rwxr-xr-xspec/unit/file_serving/configuration.rb2
-rwxr-xr-xspec/unit/file_serving/configuration/parser.rb2
-rwxr-xr-xspec/unit/indirector/checksum/file.rb2
-rwxr-xr-xspec/unit/indirector/direct_file_server.rb2
-rwxr-xr-xspec/unit/indirector/facts/facter.rb2
-rwxr-xr-xspec/unit/indirector/file.rb2
-rwxr-xr-xspec/unit/indirector/file_server.rb2
-rwxr-xr-xspec/unit/parser/ast/node.rb2
-rwxr-xr-xspec/unit/ral/provider/mount/parsed.rb2
-rwxr-xr-xspec/unit/ral/type/mount.rb2
-rw-r--r--test/lib/stubba.rb2
14 files changed, 15 insertions, 15 deletions
diff --git a/bin/pi b/bin/pi
index 5416e693f..0b700a2d0 100755
--- a/bin/pi
+++ b/bin/pi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# = Synopsis
diff --git a/bin/ralsh b/bin/ralsh
index fdf64916f..1d0036717 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 966feaf9b..714b350f8 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/spec/unit/file_serving/configuration.rb b/spec/unit/file_serving/configuration.rb
index eecaefe5f..a0710e20d 100755
--- a/spec/unit/file_serving/configuration.rb
+++ b/spec/unit/file_serving/configuration.rb
@@ -221,4 +221,4 @@ describe Puppet::FileServing::Configuration do
@config.authorized?("/one/my/file").should be_false
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/file_serving/configuration/parser.rb b/spec/unit/file_serving/configuration/parser.rb
index df2f629d5..93d30ca1c 100755
--- a/spec/unit/file_serving/configuration/parser.rb
+++ b/spec/unit/file_serving/configuration/parser.rb
@@ -132,4 +132,4 @@ describe Puppet::FileServing::Configuration::Parser do
@parser.parse
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/indirector/checksum/file.rb b/spec/unit/indirector/checksum/file.rb
index 4f8ee98b2..3a82faccc 100755
--- a/spec/unit/indirector/checksum/file.rb
+++ b/spec/unit/indirector/checksum/file.rb
@@ -137,4 +137,4 @@ describe Puppet::Checksum::File do
@store.destroy(file)
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/indirector/direct_file_server.rb b/spec/unit/indirector/direct_file_server.rb
index 9f3652536..a89b938e7 100755
--- a/spec/unit/indirector/direct_file_server.rb
+++ b/spec/unit/indirector/direct_file_server.rb
@@ -89,4 +89,4 @@ describe Puppet::Indirector::DirectFileServer do
@server.search(@uri, :testing => :one, :other => :two)
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/indirector/facts/facter.rb b/spec/unit/indirector/facts/facter.rb
index 0974a60ec..5ec66555d 100755
--- a/spec/unit/indirector/facts/facter.rb
+++ b/spec/unit/indirector/facts/facter.rb
@@ -73,4 +73,4 @@ describe Puppet::Node::Facts::Facter do
describe Puppet::Node::Facts::Facter, " when loading facts from the factpath" do
it "should load every fact in each factpath directory"
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/indirector/file.rb b/spec/unit/indirector/file.rb
index 37740f0d0..a2aa4502d 100755
--- a/spec/unit/indirector/file.rb
+++ b/spec/unit/indirector/file.rb
@@ -155,4 +155,4 @@ describe Puppet::Indirector::File do
@searcher.destroy(file)
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/indirector/file_server.rb b/spec/unit/indirector/file_server.rb
index 974b95e0e..79be8cc29 100755
--- a/spec/unit/indirector/file_server.rb
+++ b/spec/unit/indirector/file_server.rb
@@ -165,4 +165,4 @@ describe Puppet::Indirector::FileServer do
@file_server.search(@uri, :testing => :one, :other => :two)
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/parser/ast/node.rb b/spec/unit/parser/ast/node.rb
index 757934415..aaba4c2e8 100755
--- a/spec/unit/parser/ast/node.rb
+++ b/spec/unit/parser/ast/node.rb
@@ -122,4 +122,4 @@ describe Puppet::Parser::AST::Node do
@compiler.class_scope(@middle).namespaces.should be_include(@top.namespace)
end
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/ral/provider/mount/parsed.rb b/spec/unit/ral/provider/mount/parsed.rb
index b2ca22987..21276d911 100755
--- a/spec/unit/ral/provider/mount/parsed.rb
+++ b/spec/unit/ral/provider/mount/parsed.rb
@@ -182,4 +182,4 @@ describe provider_class do
it "should specify the filesystem when remounting a filesystem"
end
-end \ No newline at end of file
+end
diff --git a/spec/unit/ral/type/mount.rb b/spec/unit/ral/type/mount.rb
index 9247601e6..8fa2e6f7c 100755
--- a/spec/unit/ral/type/mount.rb
+++ b/spec/unit/ral/type/mount.rb
@@ -189,4 +189,4 @@ describe Puppet::Type::Mount::Ensure do
@mount.refresh
end
end
-end \ No newline at end of file
+end
diff --git a/test/lib/stubba.rb b/test/lib/stubba.rb
index eade747f6..747054cfc 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'