You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sebastian Bazley <se...@apache.org> on 2016/03/07 15:46:39 UTC
[whimsy.git] [1/1] Commit 3954fc4: Use ruby on the PATH, not /usr/local/bin
Commit 3954fc4b5c5fe5138f9bae498b62345e961def5f:
Use ruby on the PATH, not /usr/local/bin
Branch: refs/heads/master
Author: Sebb <se...@apache.org>
Committer: Sebb <se...@apache.org>
Pusher: sebb <se...@apache.org>
------------------------------------------------------------
tools/collate_minutes.rb | + -
tools/toucher.rb | + -
vagrant/cookbooks/whimsy/recipes/model.rb | + -
www/apmail/mods.cgi | + -
www/board/agenda/main.rb | + -
www/board/missing-reports.cgi | + -
www/board/posted-reports.cgi | + -
www/board/publish_minutes.cgi | + -
www/board/subscriptions.cgi | + -
www/classic/board/agenda/js/app._js | + -
www/classic/board/agenda/js/directives._js | + -
www/classic/board/agenda/js/filters._js | + -
www/classic/board/agenda/js/services._js | + -
www/classic/board/agenda/main.rb | + -
www/classic/board/agenda/model/draft.rb | + -
www/classic/board/agenda/views/main._html | + -
www/classic/roster/js/app._js | + -
www/classic/roster/js/services._js | + -
www/classic/roster/main.rb | + -
www/committers/subscribe.cgi | + -
www/fundraising/invoice.cgi | + -
www/fundraising/prospects.cgi | + -
www/fundraising/sponsorship.cgi | + -
www/incubator/moderators.cgi | + -
www/incubator/podlings/by-age.cgi | + -
www/incubator/signoff.cgi | + -
www/members/attendance-xcheck.cgi | + -
www/members/inactive.cgi | + -
www/members/namediff.cgi | + -
www/members/nominations.cgi | + -
www/members/non-participants.cgi | + -
www/members/proxy.cgi | + -
www/members/subscriptions.cgi | + -
www/members/watch.cgi | + -
www/new-account-request-queue.cgi | + -
www/roster/main.rb | + -
www/secmail/parsemail.rb | + -
www/secretary/icla-lint.cgi | + -
www/secretary/public-names.cgi | + -
www/secretary/response-time.cgi | + -
www/secretary/workbench/file.cgi | + -
www/secretary/workbench/upload.cgi | + -
www/secretary/workbench/worklist.cgi | + -
www/status.cgi | + -
www/status/errors.cgi | + -
www/status/index.cgi | + -
www/status/svn.cgi | + -
www/test.cgi | + -
www/test/icla/views/app.html.rb | + -
www/test/vhost-generator.cgi | + -
www/treasurer/bill-upload.cgi | + -
www/treasurer/expenses.cgi | + -
www/treasurer/index.cgi | + -
www/treasurer/paypal.cgi | + -
------------------------------------------------------------
108 changes: 54 additions, 54 deletions.
------------------------------------------------------------
diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index 313479f..e9345cf 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'whimsy/asf'
require 'date'
require 'builder'
diff --git a/tools/toucher.rb b/tools/toucher.rb
index 97bd7c9..840af45 100755
--- a/tools/toucher.rb
+++ b/tools/toucher.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Watch for updates to sources to passenger applications, and restart those
# applications whenever changes occur.
diff --git a/vagrant/cookbooks/whimsy/recipes/model.rb b/vagrant/cookbooks/whimsy/recipes/model.rb
index f3b25c9..49a9185 100644
--- a/vagrant/cookbooks/whimsy/recipes/model.rb
+++ b/vagrant/cookbooks/whimsy/recipes/model.rb
@@ -106,7 +106,7 @@
group "vagrant"
mode 0755
content <<-EOF.gsub(/^ /,'')
- #!/usr/bin/ruby
+ #!/usr/bin/env ruby
output = `ssh ${AVAILID:-#{node.user}}@minotaur.apache.org openssl s_client -connect \\
minotaur.apache.org:636 -showcerts < /dev/null 2> /dev/null`
File.open("asf-ldap-client.pem", 'w') do |file|
diff --git a/www/apmail/mods.cgi b/www/apmail/mods.cgi
index 5496628..bef4c88 100755
--- a/www/apmail/mods.cgi
+++ b/www/apmail/mods.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'shellwords'
require 'whimsy/asf'
diff --git a/www/board/agenda/main.rb b/www/board/agenda/main.rb
index d0a106e..baadbc7 100755
--- a/www/board/agenda/main.rb
+++ b/www/board/agenda/main.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Server side setup
diff --git a/www/board/missing-reports.cgi b/www/board/missing-reports.cgi
index 054b0d4..e1ee715 100755
--- a/www/board/missing-reports.cgi
+++ b/www/board/missing-reports.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'whimsy/asf/agenda'
records = 'http://www.apache.org/foundation/records/minutes/'
diff --git a/www/board/posted-reports.cgi b/www/board/posted-reports.cgi
index c872034..79a3fd3 100755
--- a/www/board/posted-reports.cgi
+++ b/www/board/posted-reports.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'mail'
require 'wunderbar'
diff --git a/www/board/publish_minutes.cgi b/www/board/publish_minutes.cgi
index de4e804..5ebd90a 100755
--- a/www/board/publish_minutes.cgi
+++ b/www/board/publish_minutes.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'date'
require 'whimsy/asf'
diff --git a/www/board/subscriptions.cgi b/www/board/subscriptions.cgi
index 9058a57..4a5c56c 100755
--- a/www/board/subscriptions.cgi
+++ b/www/board/subscriptions.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
require 'wunderbar'
require 'whimsy/asf'
diff --git a/www/classic/board/agenda/js/app._js b/www/classic/board/agenda/js/app._js
index 70579f8..6b34740 100644
--- a/www/classic/board/agenda/js/app._js
+++ b/www/classic/board/agenda/js/app._js
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
# main application, consisting of a router and a number of controllers
diff --git a/www/classic/board/agenda/js/directives._js b/www/classic/board/agenda/js/directives._js
index f94f98b..9427d45 100644
--- a/www/classic/board/agenda/js/directives._js
+++ b/www/classic/board/agenda/js/directives._js
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
# define filters used in views to help with formatting
diff --git a/www/classic/board/agenda/js/filters._js b/www/classic/board/agenda/js/filters._js
index 2cbed37..810d4a7 100644
--- a/www/classic/board/agenda/js/filters._js
+++ b/www/classic/board/agenda/js/filters._js
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
# define filters used in views to help with formatting
diff --git a/www/classic/board/agenda/js/services._js b/www/classic/board/agenda/js/services._js
index eeadb48..9a5160c 100644
--- a/www/classic/board/agenda/js/services._js
+++ b/www/classic/board/agenda/js/services._js
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
module Angular::AsfBoardServices
diff --git a/www/classic/board/agenda/main.rb b/www/classic/board/agenda/main.rb
index 9d4e73d..3563782 100755
--- a/www/classic/board/agenda/main.rb
+++ b/www/classic/board/agenda/main.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Server side router/controllers
diff --git a/www/classic/board/agenda/model/draft.rb b/www/classic/board/agenda/model/draft.rb
index a429072..db6fd1a 100755
--- a/www/classic/board/agenda/model/draft.rb
+++ b/www/classic/board/agenda/model/draft.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'yaml'
require 'whimsy/asf'
diff --git a/www/classic/board/agenda/views/main._html b/www/classic/board/agenda/views/main._html
index d680ee2..c9c9162 100755
--- a/www/classic/board/agenda/views/main._html
+++ b/www/classic/board/agenda/views/main._html
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Main "layout" for the application, houses a single view
diff --git a/www/classic/roster/js/app._js b/www/classic/roster/js/app._js
index a9fdb11..1b3e353 100644
--- a/www/classic/roster/js/app._js
+++ b/www/classic/roster/js/app._js
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
module Angular::AsfRoster
use :AsfRosterServices
diff --git a/www/classic/roster/js/services._js b/www/classic/roster/js/services._js
index 433db93..c84dbef 100644
--- a/www/classic/roster/js/services._js
+++ b/www/classic/roster/js/services._js
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
module Angular::AsfRosterServices
diff --git a/www/classic/roster/main.rb b/www/classic/roster/main.rb
index eac9f10..6bdc5b4 100755
--- a/www/classic/roster/main.rb
+++ b/www/classic/roster/main.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Server side router/controllers
diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index 89964b5..c74c60d 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'mail'
require 'whimsy/asf'
diff --git a/www/fundraising/invoice.cgi b/www/fundraising/invoice.cgi
index 9039afa..88f2dfa 100755
--- a/www/fundraising/invoice.cgi
+++ b/www/fundraising/invoice.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
# encoding: utf-8
require 'wunderbar'
require "date"
diff --git a/www/fundraising/prospects.cgi b/www/fundraising/prospects.cgi
index b4aa92e..ba5a0da 100755
--- a/www/fundraising/prospects.cgi
+++ b/www/fundraising/prospects.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'whimsy/asf'
require 'whimsy/asf/podlings'
diff --git a/www/fundraising/sponsorship.cgi b/www/fundraising/sponsorship.cgi
index 38d559b..5d247ac 100755
--- a/www/fundraising/sponsorship.cgi
+++ b/www/fundraising/sponsorship.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'whimsy/asf'
require 'whimsy/asf/podlings'
diff --git a/www/incubator/moderators.cgi b/www/incubator/moderators.cgi
index 30065b2..6ac60af 100755
--- a/www/incubator/moderators.cgi
+++ b/www/incubator/moderators.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'whimsy/asf'
require 'nokogiri'
diff --git a/www/incubator/podlings/by-age.cgi b/www/incubator/podlings/by-age.cgi
index 994193a..2d4ba66 100755
--- a/www/incubator/podlings/by-age.cgi
+++ b/www/incubator/podlings/by-age.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'nokogiri'
require 'date'
require 'net/http'
diff --git a/www/incubator/signoff.cgi b/www/incubator/signoff.cgi
index ebaedfc..4311582 100755
--- a/www/incubator/signoff.cgi
+++ b/www/incubator/signoff.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
# quick and dirty script to tally up which mentors have been providing
# signoffs and which have not.
diff --git a/www/members/attendance-xcheck.cgi b/www/members/attendance-xcheck.cgi
index 2f49060..39e16ff 100755
--- a/www/members/attendance-xcheck.cgi
+++ b/www/members/attendance-xcheck.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'whimsy/asf'
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index d1f146b..22d0d6f 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'whimsy/asf'
diff --git a/www/members/namediff.cgi b/www/members/namediff.cgi
index 2f36fb5..c98d1d7 100755
--- a/www/members/namediff.cgi
+++ b/www/members/namediff.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'whimsy/asf'
diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index c49ce34..540b721 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'mail'
diff --git a/www/members/non-participants.cgi b/www/members/non-participants.cgi
index 94ea463..2b7599d 100755
--- a/www/members/non-participants.cgi
+++ b/www/members/non-participants.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'whimsy/asf'
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 5c3e386..82440e1 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'wunderbar'
diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index 51465f2..4e0bfbf 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'wunderbar'
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index 1c9d515..83bfc08 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'wunderbar'
diff --git a/www/new-account-request-queue.cgi b/www/new-account-request-queue.cgi
index a1a1141..35fa0d3 100755
--- a/www/new-account-request-queue.cgi
+++ b/www/new-account-request-queue.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
ACREQ = '/var/tools/acreq'
Dir.chdir '/var/tools'
require "./new-account-request-queue"
diff --git a/www/roster/main.rb b/www/roster/main.rb
index 7f49442..1922f78 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Server side router/controllers
diff --git a/www/secmail/parsemail.rb b/www/secmail/parsemail.rb
index a501f37..391a416 100644
--- a/www/secmail/parsemail.rb
+++ b/www/secmail/parsemail.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Parse (and optionally fetch) officer-secretary emails for later
diff --git a/www/secretary/icla-lint.cgi b/www/secretary/icla-lint.cgi
index 0ad2e90..bf848b4 100755
--- a/www/secretary/icla-lint.cgi
+++ b/www/secretary/icla-lint.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar/script'
require 'ruby2js/filter/functions'
require 'whimsy/asf'
diff --git a/www/secretary/public-names.cgi b/www/secretary/public-names.cgi
index f0bc39d..5c1c51d 100755
--- a/www/secretary/public-names.cgi
+++ b/www/secretary/public-names.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'whimsy/asf'
require 'wunderbar/script'
diff --git a/www/secretary/response-time.cgi b/www/secretary/response-time.cgi
index af1e9ad..78cdd2a 100755
--- a/www/secretary/response-time.cgi
+++ b/www/secretary/response-time.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'whimsy/asf'
require 'wunderbar/jquery'
diff --git a/www/secretary/workbench/file.cgi b/www/secretary/workbench/file.cgi
index e1b211a..e23e591 100755
--- a/www/secretary/workbench/file.cgi
+++ b/www/secretary/workbench/file.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'open3'
require './local_paths'
diff --git a/www/secretary/workbench/upload.cgi b/www/secretary/workbench/upload.cgi
index f003d60..f35c1a2 100755
--- a/www/secretary/workbench/upload.cgi
+++ b/www/secretary/workbench/upload.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'mail'
diff --git a/www/secretary/workbench/worklist.cgi b/www/secretary/workbench/worklist.cgi
index c1e1bb3..099e3f2 100755
--- a/www/secretary/workbench/worklist.cgi
+++ b/www/secretary/workbench/worklist.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'yaml'
diff --git a/www/status.cgi b/www/status.cgi
index ac58401..8c7e4df 100755
--- a/www/status.cgi
+++ b/www/status.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
# the following is what infrastructure team sees:
diff --git a/www/status/errors.cgi b/www/status/errors.cgi
index cf2807c..c37b430 100755
--- a/www/status/errors.cgi
+++ b/www/status/errors.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
#
# Fetch and parse the Ping My Box error log
diff --git a/www/status/index.cgi b/www/status/index.cgi
index 3c48bb0..66cc103 100755
--- a/www/status/index.cgi
+++ b/www/status/index.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'json'
require 'time'
diff --git a/www/status/svn.cgi b/www/status/svn.cgi
index 7b8c1fd..f83f9f1 100755
--- a/www/status/svn.cgi
+++ b/www/status/svn.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
diff --git a/www/test.cgi b/www/test.cgi
index 434ac6a..011c7f6 100755
--- a/www/test.cgi
+++ b/www/test.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
print "Content-type: text/plain\r\n\r\n"
diff --git a/www/test/icla/views/app.html.rb b/www/test/icla/views/app.html.rb
index f5ee101..9ecb06b 100755
--- a/www/test/icla/views/app.html.rb
+++ b/www/test/icla/views/app.html.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
# encoding: utf-8
require 'wunderbar'
diff --git a/www/test/vhost-generator.cgi b/www/test/vhost-generator.cgi
index e7ad23f..eac54de 100755
--- a/www/test/vhost-generator.cgi
+++ b/www/test/vhost-generator.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
diff --git a/www/treasurer/bill-upload.cgi b/www/treasurer/bill-upload.cgi
index a62e6e1..035d88e 100755
--- a/www/treasurer/bill-upload.cgi
+++ b/www/treasurer/bill-upload.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/treasurer/expenses.cgi b/www/treasurer/expenses.cgi
index 1504cdb..226a94d 100755
--- a/www/treasurer/expenses.cgi
+++ b/www/treasurer/expenses.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'yaml'
require 'whimsy/asf'
diff --git a/www/treasurer/index.cgi b/www/treasurer/index.cgi
index 11536db..cacb31b 100755
--- a/www/treasurer/index.cgi
+++ b/www/treasurer/index.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'whimsy/asf'
$SAFE = 1
diff --git a/www/treasurer/paypal.cgi b/www/treasurer/paypal.cgi
index 8304977..194420f 100755
--- a/www/treasurer/paypal.cgi
+++ b/www/treasurer/paypal.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
require 'wunderbar'
require 'csv'
require 'whimsy/asf'