You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2019/02/18 19:48:11 UTC
[whimsy] branch master updated: Standardise Whimsy library location
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 7638dbe Standardise Whimsy library location
7638dbe is described below
commit 7638dbe1ff4f818ac0566e6c0a6b4de8a9b775b8
Author: Sebb <se...@apache.org>
AuthorDate: Mon Feb 18 19:48:09 2019 +0000
Standardise Whimsy library location
---
Rakefile | 2 +-
examples/board.rb | 2 +-
tools/agenda_summary.rb | 2 +-
tools/collate_minutes.rb | 2 +-
tools/iclasort.rb | 2 +-
tools/mboxhdr2csv.rb | 2 +-
tools/membersort.rb | 2 +-
tools/moderationhelper.rb | 2 +-
tools/modify_pmcchairs.rb | 2 +-
tools/proxyhelper.rb | 2 +-
tools/site-scan.rb | 2 +-
tools/testmail.rb | 2 +-
tools/travis-relay.rb | 2 +-
tools/vhosttest.rb | 2 +-
tools/wwwdocs.rb | 2 +-
www/apmail/mods.cgi | 2 +-
www/board/agenda/Rakefile | 2 +-
www/board/agenda/bin/remind-cronjob.rb | 2 +-
www/board/agenda/views/actions/post-data.json.rb | 2 +-
www/board/missing-reports.cgi | 2 +-
www/board/posted-reports.cgi | 2 +-
www/board/publish_minutes.cgi | 2 +-
www/board/subscriptions.cgi | 2 +-
www/brand/list.cgi | 2 +-
www/brand/replyedit.cgi | 2 +-
www/brand/replylist.cgi | 2 +-
www/brand/replyui.cgi | 2 +-
www/committers/ldap-map.cgi | 2 +-
www/committers/subscribe.cgi | 2 +-
www/committers/svn-info.cgi | 2 +-
www/committers/testauth.cgi | 2 +-
www/committers/tm-report.cgi | 2 +-
www/committers/tools.cgi | 2 +-
www/docs/index.cgi | 2 +-
www/events/other.cgi | 2 +-
www/events/past.cgi | 2 +-
www/events/talks.cgi | 2 +-
www/foundation/orgchart.cgi | 2 +-
www/incubator/maillist.cgi | 2 +-
www/incubator/podling-crosscheck.cgi | 2 +-
www/incubator/podlings/by-age.cgi | 2 +-
www/incubator/signoff.cgi | 2 +-
www/members/attendance-xcheck.cgi | 2 +-
www/members/board-attend.cgi | 2 +-
www/members/inactive.cgi | 2 +-
www/members/index.cgi | 2 +-
www/members/logs.cgi | 2 +-
www/members/memberless-pmcs.cgi | 2 +-
www/members/mirror_check.cgi | 2 +-
www/members/namediff.cgi | 2 +-
www/members/nominations.cgi | 2 +-
www/members/non-participants.cgi | 2 +-
www/members/proxy.cgi | 2 +-
www/members/security-subs.cgi | 2 +-
www/members/subscriptions.cgi | 2 +-
www/members/watch.cgi | 2 +-
www/members/whatif.cgi | 2 +-
www/officers/acreq.cgi | 2 +-
www/officers/board-stats.cgi | 2 +-
www/officers/mlreq.cgi | 2 +-
www/pods.cgi | 2 +-
www/roster/public_json_common.rb | 2 +-
www/secretary/icla-lint.cgi | 2 +-
www/site.cgi | 2 +-
www/status/monitors/public_json.rb | 2 +-
www/status/svn.cgi | 2 +-
www/test/dataflow.cgi | 2 +-
www/test/example.cgi | 2 +-
www/treasurer/bill-upload.cgi | 2 +-
69 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/Rakefile b/Rakefile
index 68b1a2e..e2b492b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -75,7 +75,7 @@ task :pristine do
end
task :config do
- $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+ $LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf/config'
end
diff --git a/examples/board.rb b/examples/board.rb
index 3308c90..925f7d1 100644
--- a/examples/board.rb
+++ b/examples/board.rb
@@ -10,7 +10,7 @@
#
# ruby examples/board.rb --install=/Users/rubys/Sites/
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
_html do
diff --git a/tools/agenda_summary.rb b/tools/agenda_summary.rb
index f26b78f..19d8389 100755
--- a/tools/agenda_summary.rb
+++ b/tools/agenda_summary.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Parse board meeting minutes and emit statistics
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'whimsy/asf/agenda'
require 'json'
diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index 190a124..c664578 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
puts $LOAD_PATH.first
require 'whimsy/asf'
diff --git a/tools/iclasort.rb b/tools/iclasort.rb
index 6b2950d..ad7ca3a 100644
--- a/tools/iclasort.rb
+++ b/tools/iclasort.rb
@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
OFFICERS = ASF::SVN['officers']
diff --git a/tools/mboxhdr2csv.rb b/tools/mboxhdr2csv.rb
index c7ca8c9..c4fe5b9 100644
--- a/tools/mboxhdr2csv.rb
+++ b/tools/mboxhdr2csv.rb
@@ -7,7 +7,7 @@
# Count lines of text content in mail body, roughly attempting to
# count just new content (not automated, not > replies)
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'mail'
require 'csv'
diff --git a/tools/membersort.rb b/tools/membersort.rb
index 98df10d..bd7630b 100644
--- a/tools/membersort.rb
+++ b/tools/membersort.rb
@@ -1,6 +1,6 @@
# svn update and sort the members.txt file and show the differences
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
FOUNDATION = ASF::SVN['foundation']
diff --git a/tools/moderationhelper.rb b/tools/moderationhelper.rb
index 742a007..e7b7720 100755
--- a/tools/moderationhelper.rb
+++ b/tools/moderationhelper.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
=begin
APP to generate the correct ezmlm syntax for moderators
diff --git a/tools/modify_pmcchairs.rb b/tools/modify_pmcchairs.rb
index ede42bd..69e3459 100755
--- a/tools/modify_pmcchairs.rb
+++ b/tools/modify_pmcchairs.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
#
# add/remove people from PMC Chairs
diff --git a/tools/proxyhelper.rb b/tools/proxyhelper.rb
index 460e1e6..2858dd0 100644
--- a/tools/proxyhelper.rb
+++ b/tools/proxyhelper.rb
@@ -3,7 +3,7 @@
# TODO Add function to email proxies with their info
# TODO Add function to cross-check irc log that all proxy/attendee were marked
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'mail'
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 88cd3d4..234f070 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -6,7 +6,7 @@
# See Also: lib/whimsy/sitestandards.rb
#
# Makes no value judgements. Simply extracts raw data for offline analysis.
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'net/http'
require 'nokogiri'
require 'json'
diff --git a/tools/testmail.rb b/tools/testmail.rb
index 3e38571..3e606e8 100644
--- a/tools/testmail.rb
+++ b/tools/testmail.rb
@@ -8,7 +8,7 @@
# Note: this will send an email to THAT user.
#
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'mail'
require 'etc'
diff --git a/tools/travis-relay.rb b/tools/travis-relay.rb
index 1d6ff9f..f6399c2 100644
--- a/tools/travis-relay.rb
+++ b/tools/travis-relay.rb
@@ -10,7 +10,7 @@
munge = %w(received delivered-to return-path)
skip = %w(content-type content-transfer-encoding)
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'mail'
require 'whimsy/asf'
diff --git a/tools/vhosttest.rb b/tools/vhosttest.rb
index d43cd11..251435b 100644
--- a/tools/vhosttest.rb
+++ b/tools/vhosttest.rb
@@ -3,7 +3,7 @@
# preprocess_vhosts.rb puppet macro
#
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
IP = ASF::Git['infrastructure-puppet']
diff --git a/tools/wwwdocs.rb b/tools/wwwdocs.rb
index e85c408..238b4cc 100755
--- a/tools/wwwdocs.rb
+++ b/tools/wwwdocs.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Scan all /www scripts for WVisible PAGETITLE and categories
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
SCANDIR = "../www"
ISERR = '!'
diff --git a/www/apmail/mods.cgi b/www/apmail/mods.cgi
index ce73115..c7371c5 100755
--- a/www/apmail/mods.cgi
+++ b/www/apmail/mods.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'shellwords'
require 'whimsy/asf'
diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index 975c527..2e45ae3 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift '/srv/whimsy/lib'
# Remove world writable directories that Travis may insert into the PATH,
# as these cause security errors during testing
diff --git a/www/board/agenda/bin/remind-cronjob.rb b/www/board/agenda/bin/remind-cronjob.rb
index ad9fef2..dc1243b 100644
--- a/www/board/agenda/bin/remind-cronjob.rb
+++ b/www/board/agenda/bin/remind-cronjob.rb
@@ -9,7 +9,7 @@
Dir.chdir File.expand_path('../..', __FILE__)
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../../../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf/agenda'
require 'mail'
require 'listen'
diff --git a/www/board/agenda/views/actions/post-data.json.rb b/www/board/agenda/views/actions/post-data.json.rb
index d8c9a99..1ba30f7 100644
--- a/www/board/agenda/views/actions/post-data.json.rb
+++ b/www/board/agenda/views/actions/post-data.json.rb
@@ -7,7 +7,7 @@
# debugging support: enable script to be run from the command line
if $0 == __FILE__
- $LOAD_PATH.unshift File.realpath(File.expand_path('../'*6 + 'lib', __FILE__))
+ $LOAD_PATH.unshift '/srv/whimsy/lib'
Dir.chdir File.expand_path('../..', __dir__)
require './helpers/string'
require 'whimsy/asf'
diff --git a/www/board/missing-reports.cgi b/www/board/missing-reports.cgi
index e13c097..28a6eea 100755
--- a/www/board/missing-reports.cgi
+++ b/www/board/missing-reports.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
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 f2e3de7..4db5b5d 100755
--- a/www/board/posted-reports.cgi
+++ b/www/board/posted-reports.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'date'
require 'mail'
require 'wunderbar'
diff --git a/www/board/publish_minutes.cgi b/www/board/publish_minutes.cgi
index 8cbf491..aaf5597 100755
--- a/www/board/publish_minutes.cgi
+++ b/www/board/publish_minutes.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'date'
require 'whimsy/asf'
diff --git a/www/board/subscriptions.cgi b/www/board/subscriptions.cgi
index d0d6f0a..d71dc4f 100755
--- a/www/board/subscriptions.cgi
+++ b/www/board/subscriptions.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Board@ List CrossCheck - PMC Chairs" # Wvisible:board,mail
-$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'whimsy/asf'
diff --git a/www/brand/list.cgi b/www/brand/list.cgi
index dee53a3..5bc18fd 100755
--- a/www/brand/list.cgi
+++ b/www/brand/list.cgi
@@ -4,7 +4,7 @@ PAGETITLE = "Listing of Apache Trademarks" # Wvisible:brand,trademarks
# return output in JSON format if the query string includes 'json'
ENV['HTTP_ACCEPT'] = 'application/json' if ENV['QUERY_STRING'].include? 'json'
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'csv'
require 'json'
require 'whimsy/asf'
diff --git a/www/brand/replyedit.cgi b/www/brand/replyedit.cgi
index e2332ed..b4fc49a 100755
--- a/www/brand/replyedit.cgi
+++ b/www/brand/replyedit.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "DEMO: proposed UI for editing a response to question from boilerplate"
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar'
require 'wunderbar/bootstrap'
diff --git a/www/brand/replylist.cgi b/www/brand/replylist.cgi
index 1caa1df..b854be2 100755
--- a/www/brand/replylist.cgi
+++ b/www/brand/replylist.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "DEMO: proposed UI for mailing list view for reply features"
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar'
require 'wunderbar/bootstrap'
diff --git a/www/brand/replyui.cgi b/www/brand/replyui.cgi
index 1786ca1..16a679c 100755
--- a/www/brand/replyui.cgi
+++ b/www/brand/replyui.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "DEMO: proposed UI for popup/dialog to choose a reply boilerplate"
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar'
require 'wunderbar/bootstrap'
diff --git a/www/committers/ldap-map.cgi b/www/committers/ldap-map.cgi
index 8736a80..b3169b4 100755
--- a/www/committers/ldap-map.cgi
+++ b/www/committers/ldap-map.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Mapping Committer IDs In JIRA and Confluence" # Wvisible:tools
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'tmpdir'
require 'json'
require 'time'
diff --git a/www/committers/subscribe.cgi b/www/committers/subscribe.cgi
index d736215..6961ea7 100755
--- a/www/committers/subscribe.cgi
+++ b/www/committers/subscribe.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "ASF Mailing List Subscription Helper" # Wvisible:mail subscribe
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'mail'
diff --git a/www/committers/svn-info.cgi b/www/committers/svn-info.cgi
index 63afa59..5ba4c40 100755
--- a/www/committers/svn-info.cgi
+++ b/www/committers/svn-info.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Subversion Info Helper" # Wvisible:tools svn
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'whimsy/asf'
diff --git a/www/committers/testauth.cgi b/www/committers/testauth.cgi
index 04c1c0b..5a4c62c 100755
--- a/www/committers/testauth.cgi
+++ b/www/committers/testauth.cgi
@@ -4,7 +4,7 @@ PAGETITLE = "Board Agenda Auth Tester" # Wvisible:board tools
# Small CGI to help debug board agenda authentication issues
#
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'whimsy/asf/rack'
diff --git a/www/committers/tm-report.cgi b/www/committers/tm-report.cgi
index 4e71d55..c66e19f 100755
--- a/www/committers/tm-report.cgi
+++ b/www/committers/tm-report.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Trademark Misuse Reporting Form"
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'wunderbar/jquery'
diff --git a/www/committers/tools.cgi b/www/committers/tools.cgi
index a2b9bd2..093f428 100755
--- a/www/committers/tools.cgi
+++ b/www/committers/tools.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Listing Of Whimsy Tools" # Wvisible:tools
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/docs/index.cgi b/www/docs/index.cgi
index f2ea1c1..273d5c7 100755
--- a/www/docs/index.cgi
+++ b/www/docs/index.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Whimsy Code Documentation" # Wvisible:docs
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/events/other.cgi b/www/events/other.cgi
index 59baceb..063542a 100755
--- a/www/events/other.cgi
+++ b/www/events/other.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Other FOSS Conference Listings" # Wvisible:events
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'net/http'
require 'whimsy/asf'
diff --git a/www/events/past.cgi b/www/events/past.cgi
index 5a114a2..e3c1a0a 100755
--- a/www/events/past.cgi
+++ b/www/events/past.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "ApacheCon Historical Listing" # Wvisible:events,apachecon
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'csv'
require 'json'
require 'whimsy/asf'
diff --git a/www/events/talks.cgi b/www/events/talks.cgi
index 9899f28..a365bf5 100755
--- a/www/events/talks.cgi
+++ b/www/events/talks.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Related Talks Listing" # Wvisible:events
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/foundation/orgchart.cgi b/www/foundation/orgchart.cgi
index ef1a3be..199ca26 100755
--- a/www/foundation/orgchart.cgi
+++ b/www/foundation/orgchart.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Corporate Organization Chart" # Wvisible:orgchart
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'whimsy/asf/orgchart' # New class not yet in gem; duplicates www/roster/models/orgchart
diff --git a/www/incubator/maillist.cgi b/www/incubator/maillist.cgi
index effe212..922add0 100755
--- a/www/incubator/maillist.cgi
+++ b/www/incubator/maillist.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Incubator Podling Mailing Lists" # Wvisible:incubator mail
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar/bootstrap'
diff --git a/www/incubator/podling-crosscheck.cgi b/www/incubator/podling-crosscheck.cgi
index 349bf35..853889e 100755
--- a/www/incubator/podling-crosscheck.cgi
+++ b/www/incubator/podling-crosscheck.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Incubator/Podling crosscheck" # Wvisible:incubator
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/incubator/podlings/by-age.cgi b/www/incubator/podlings/by-age.cgi
index 35ee521..80641ec 100755
--- a/www/incubator/podlings/by-age.cgi
+++ b/www/incubator/podlings/by-age.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Incubator Podlings By Age" # Wvisible:incubator historical
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'nokogiri'
require 'date'
require 'net/http'
diff --git a/www/incubator/signoff.cgi b/www/incubator/signoff.cgi
index 38a2f94..a6ad15e 100755
--- a/www/incubator/signoff.cgi
+++ b/www/incubator/signoff.cgi
@@ -3,7 +3,7 @@ PAGETITLE = "Incubator Mentor Signoffs" # Wvisible:incubator
# quick and dirty script to tally up which mentors have been providing
# signoffs and which have not.
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'nokogiri'
require 'wunderbar'
require 'wunderbar/bootstrap'
diff --git a/www/members/attendance-xcheck.cgi b/www/members/attendance-xcheck.cgi
index b24ad84..7d8c647 100755
--- a/www/members/attendance-xcheck.cgi
+++ b/www/members/attendance-xcheck.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Member's Meeting Attendance Cross-Check" # Wvisible:meeting
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar/bootstrap'
diff --git a/www/members/board-attend.cgi b/www/members/board-attend.cgi
index 03c0263..bbfdc6f 100755
--- a/www/members/board-attend.cgi
+++ b/www/members/board-attend.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Board Meeting Attendance since 2010" # Wvisible:meeting
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'whimsy/asf/agenda'
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 3ba7980..7ec470f 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar/bootstrap'
diff --git a/www/members/index.cgi b/www/members/index.cgi
index 728d197..e42bb5d 100755
--- a/www/members/index.cgi
+++ b/www/members/index.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Overview of Whimsy Tools for Members" # Wvisible:meeting
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/members/logs.cgi b/www/members/logs.cgi
index f7a2ddb..10d2be6 100755
--- a/www/members/logs.cgi
+++ b/www/members/logs.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Server error log listing" # Wvisible:debug
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/members/memberless-pmcs.cgi b/www/members/memberless-pmcs.cgi
index 61fd72f..ca449b9 100755
--- a/www/members/memberless-pmcs.cgi
+++ b/www/members/memberless-pmcs.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Crosscheck PMCs with few/no ASF Members" # Wvisible:members
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar'
require 'wunderbar/bootstrap'
diff --git a/www/members/mirror_check.cgi b/www/members/mirror_check.cgi
index 5a96a1f..ff3ee1c 100755
--- a/www/members/mirror_check.cgi
+++ b/www/members/mirror_check.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "ASF Distribution Mirror Checker" # Wvisible:infra mirror
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'whimsy/asf'
diff --git a/www/members/namediff.cgi b/www/members/namediff.cgi
index fa5598b..6516fe3 100755
--- a/www/members/namediff.cgi
+++ b/www/members/namediff.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Crosscheck Members Names With ICLAs" # Wvisible:members
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar/bootstrap'
diff --git a/www/members/nominations.cgi b/www/members/nominations.cgi
index 793eaac..8e28f1e 100755
--- a/www/members/nominations.cgi
+++ b/www/members/nominations.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Member nominations cross-check" # Wvisible:meeting
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'mail'
require 'wunderbar/bootstrap'
diff --git a/www/members/non-participants.cgi b/www/members/non-participants.cgi
index 2979b3e..6930939 100755
--- a/www/members/non-participants.cgi
+++ b/www/members/non-participants.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Active Members not participating in meetings" # Wvisible:meeting
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'wunderbar/bootstrap'
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 7b76725..9cdf3bb 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'whimsy/asf'
diff --git a/www/members/security-subs.cgi b/www/members/security-subs.cgi
index 1b8ffa2..29c052b 100755
--- a/www/members/security-subs.cgi
+++ b/www/members/security-subs.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar/bootstrap'
require 'whimsy/asf'
require 'whimsy/asf/mlist'
diff --git a/www/members/subscriptions.cgi b/www/members/subscriptions.cgi
index 0d68e82..edede19 100755
--- a/www/members/subscriptions.cgi
+++ b/www/members/subscriptions.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache members@ Subscription Crosscheck" # Wvisible:members
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'whimsy/asf'
diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index ecb59cb..6104300 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Potential ASF Member Watch List" # Wvisible:members
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'whimsy/asf'
diff --git a/www/members/whatif.cgi b/www/members/whatif.cgi
index aada25e..c8e6fc9 100755
--- a/www/members/whatif.cgi
+++ b/www/members/whatif.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf/config'
require 'whimsy/asf/svn'
diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index 8d6771c..eb356bb 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Account Submission Helper Form" # Wvisible:infra accounts
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'wunderbar/jquery'
diff --git a/www/officers/board-stats.cgi b/www/officers/board-stats.cgi
index 5dc9c80..a541fef 100755
--- a/www/officers/board-stats.cgi
+++ b/www/officers/board-stats.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Board Meeting Statistics since 2007" # Wvisible:meeting
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'whimsy/asf/agenda'
diff --git a/www/officers/mlreq.cgi b/www/officers/mlreq.cgi
index b319c7c..07bcb8a 100755
--- a/www/officers/mlreq.cgi
+++ b/www/officers/mlreq.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Mailing list Request Form" # Wvisible:infra mail list
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'shellwords'
require 'mail'
diff --git a/www/pods.cgi b/www/pods.cgi
index 1b9d0a4..6de5f8c 100755
--- a/www/pods.cgi
+++ b/www/pods.cgi
@@ -9,7 +9,7 @@ unless ENV['PATH_INFO'] and not ENV['PATH_INFO'].empty?
exit
end
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'net/http'
require 'time' # for httpdate
diff --git a/www/roster/public_json_common.rb b/www/roster/public_json_common.rb
index c2ff8a2..ff4de5c 100644
--- a/www/roster/public_json_common.rb
+++ b/www/roster/public_json_common.rb
@@ -7,7 +7,7 @@
# Status updates: https://whimsy-test.apache.org/status/
#
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
require 'json'
diff --git a/www/secretary/icla-lint.cgi b/www/secretary/icla-lint.cgi
index 5e10de2..316309b 100755
--- a/www/secretary/icla-lint.cgi
+++ b/www/secretary/icla-lint.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar/script'
require 'ruby2js/filter/functions'
diff --git a/www/site.cgi b/www/site.cgi
index 2a3edea..eff1094 100755
--- a/www/site.cgi
+++ b/www/site.cgi
@@ -9,7 +9,7 @@ unless ENV['PATH_INFO'] and not ENV['PATH_INFO'].empty?
exit
end
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'net/http'
require 'time' # for httpdate
diff --git a/www/status/monitors/public_json.rb b/www/status/monitors/public_json.rb
index c508369..c9c9660 100644
--- a/www/status/monitors/public_json.rb
+++ b/www/status/monitors/public_json.rb
@@ -94,7 +94,7 @@ def Monitor.public_json(previous_status)
$stderr.puts "Would send e-mail for #{name} #{lvl}"
begin
require 'mail'
- $LOAD_PATH.unshift File.realpath(File.expand_path('../../../../lib', __FILE__))
+ $LOAD_PATH.unshift '/srv/whimsy/lib'
require 'whimsy/asf'
ASF::Mail.configure
mail = Mail.new do
diff --git a/www/status/svn.cgi b/www/status/svn.cgi
index 6a4a5cf..8cc1bc9 100755
--- a/www/status/svn.cgi
+++ b/www/status/svn.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
#
# SVN Repository status
diff --git a/www/test/dataflow.cgi b/www/test/dataflow.cgi
index d9931a6..9ea0ebd 100755
--- a/www/test/dataflow.cgi
+++ b/www/test/dataflow.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Public Datafiles And Dependencies" # Wvisible:tools data
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
# Command line use: emit replacement for www/public/README.html
diff --git a/www/test/example.cgi b/www/test/example.cgi
index 64cc311..948afdb 100755
--- a/www/test/example.cgi
+++ b/www/test/example.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
PAGETITLE = "Example Whimsy Script With Styles" # Wvisible:tools Note: PAGETITLE must be double quoted
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'json'
require 'whimsy/asf'
require 'wunderbar'
diff --git a/www/treasurer/bill-upload.cgi b/www/treasurer/bill-upload.cgi
index a4b0a87..afe5ca6 100755
--- a/www/treasurer/bill-upload.cgi
+++ b/www/treasurer/bill-upload.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
PAGETITLE = "Apache Treasurer Bill Upload" # Wvisible:treasurer
-$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
+$LOAD_PATH.unshift '/srv/whimsy/lib'
require 'wunderbar'
require 'wunderbar/bootstrap'
require 'wunderbar/jquery'