From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 5 Nov 2008 01:03:06 +0000 (-0700)
Subject: shebang: replace "/usr/bin/python" with "/usr/bin/env python"
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/file/URI:LIT:krugkidfnzsc4/index.php?a=commitdiff_plain;h=eae5403e5af0d39ec0f6d7f093d205e47138cf3e;p=tahoe-lafs%2Ftahoe-lafs.git

shebang: replace "/usr/bin/python" with "/usr/bin/env python"
---

diff --git a/misc/count_dirs.py b/misc/count_dirs.py
index 0af03148..78412d33 100644
--- a/misc/count_dirs.py
+++ b/misc/count_dirs.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 """
 This tool estimates how much space would be consumed by a filetree into which
diff --git a/misc/cpu-watcher-poll.py b/misc/cpu-watcher-poll.py
index 68cc8595..68ac4b46 100644
--- a/misc/cpu-watcher-poll.py
+++ b/misc/cpu-watcher-poll.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 from foolscap import Tub, eventual
 from twisted.internet import reactor
diff --git a/misc/find-share-anomalies.py b/misc/find-share-anomalies.py
index f876afa0..76fe3419 100644
--- a/misc/find-share-anomalies.py
+++ b/misc/find-share-anomalies.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # feed this the results of 'tahoe catalog-shares' for all servers
 
diff --git a/misc/find-trailing-spaces.py b/misc/find-trailing-spaces.py
index 21b25243..a1313216 100644
--- a/misc/find-trailing-spaces.py
+++ b/misc/find-trailing-spaces.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os
 
diff --git a/misc/get-version.py b/misc/get-version.py
index f5810676..a9a637a7 100644
--- a/misc/get-version.py
+++ b/misc/get-version.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 """Determine the version number of the current tree.
 
diff --git a/misc/logtool.py b/misc/logtool.py
index ff61b6ab..16ec40e6 100644
--- a/misc/logtool.py
+++ b/misc/logtool.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os.path, time, pickle
 import foolscap
diff --git a/misc/make-canary-files.py b/misc/make-canary-files.py
index 0baa6dd4..44f0348a 100644
--- a/misc/make-canary-files.py
+++ b/misc/make-canary-files.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 """
 Given a list of nodeids and a 'convergence' file, create a bunch of files
diff --git a/misc/make_umid b/misc/make_umid
index c8b39dfe..60aab23a 100644
--- a/misc/make_umid
+++ b/misc/make_umid
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """Create a short probably-unique string for use as a umid= argument in a
 Foolscap log() call, to make it easier to locate the source code that
diff --git a/misc/munin/tahoe_cpu_watcher b/misc/munin/tahoe_cpu_watcher
index 1b1df335..bd349cb2 100644
--- a/misc/munin/tahoe_cpu_watcher
+++ b/misc/munin/tahoe_cpu_watcher
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os, sys, re
 import urllib
diff --git a/misc/munin/tahoe_diskleft b/misc/munin/tahoe_diskleft
index 8a177f6c..fc568bbe 100644
--- a/misc/munin/tahoe_diskleft
+++ b/misc/munin/tahoe_diskleft
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This is a munin plugin which pulls data from the server in
 # misc/spacetime/diskwatcher.tac . It produces a graph of how much free space
diff --git a/misc/munin/tahoe_diskusage b/misc/munin/tahoe_diskusage
index 80b9df6c..9810220f 100644
--- a/misc/munin/tahoe_diskusage
+++ b/misc/munin/tahoe_diskusage
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This is a munin plugin which pulls data from the server in
 # misc/spacetime/diskwatcher.tac . It produces a graph of how much disk space
diff --git a/misc/munin/tahoe_doomsday b/misc/munin/tahoe_doomsday
index a4631026..c8ab1c0a 100644
--- a/misc/munin/tahoe_doomsday
+++ b/misc/munin/tahoe_doomsday
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This is a munin plugin which pulls data from the server in
 # misc/spacetime/diskwatcher.tac . It produces a graph of how much time is
diff --git a/misc/munin/tahoe_estimate_files b/misc/munin/tahoe_estimate_files
index 4723cdad..249565e4 100644
--- a/misc/munin/tahoe_estimate_files
+++ b/misc/munin/tahoe_estimate_files
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import sys, os.path
 
diff --git a/misc/munin/tahoe_files b/misc/munin/tahoe_files
index c6026de1..e68b59da 100644
--- a/misc/munin/tahoe_files
+++ b/misc/munin/tahoe_files
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This is a munin plugin to track the number of files that each node's
 # StorageServer is holding on behalf of other nodes. Each file that has been
diff --git a/misc/munin/tahoe_helperstats_active b/misc/munin/tahoe_helperstats_active
index 472c8c42..3265e5f0 100644
--- a/misc/munin/tahoe_helperstats_active
+++ b/misc/munin/tahoe_helperstats_active
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os, sys
 import urllib
diff --git a/misc/munin/tahoe_helperstats_fetched b/misc/munin/tahoe_helperstats_fetched
index c64101df..1f807beb 100644
--- a/misc/munin/tahoe_helperstats_fetched
+++ b/misc/munin/tahoe_helperstats_fetched
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os, sys
 import urllib
diff --git a/misc/munin/tahoe_introstats b/misc/munin/tahoe_introstats
index 5f506eb9..52c743c3 100644
--- a/misc/munin/tahoe_introstats
+++ b/misc/munin/tahoe_introstats
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os, sys
 import urllib
diff --git a/misc/munin/tahoe_nodememory b/misc/munin/tahoe_nodememory
index 670e32e5..fd3f8b0a 100644
--- a/misc/munin/tahoe_nodememory
+++ b/misc/munin/tahoe_nodememory
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This munin plugin isolates processes by looking for the 'pid' file created
 # by 'allmydata start', then extracts the amount of memory they consume (both
diff --git a/misc/munin/tahoe_overhead b/misc/munin/tahoe_overhead
index ba2e1ddf..266fe939 100644
--- a/misc/munin/tahoe_overhead
+++ b/misc/munin/tahoe_overhead
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This is a munin plugin which pulls total-used data from the server in
 # misc/spacetime/diskwatcher.tac, and a total-deep-size number from custom
diff --git a/misc/munin/tahoe_rootdir_space b/misc/munin/tahoe_rootdir_space
index e3830fe4..c9acb3cb 100644
--- a/misc/munin/tahoe_rootdir_space
+++ b/misc/munin/tahoe_rootdir_space
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import os, sys
 import urllib
diff --git a/misc/munin/tahoe_server_latency_ b/misc/munin/tahoe_server_latency_
index a47fdf31..a63f902c 100644
--- a/misc/munin/tahoe_server_latency_
+++ b/misc/munin/tahoe_server_latency_
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # retrieve a latency statistic for a given operation and percentile from a
 # set of storage servers.
diff --git a/misc/munin/tahoe_server_operations_ b/misc/munin/tahoe_server_operations_
index c28490da..3f624757 100644
--- a/misc/munin/tahoe_server_operations_
+++ b/misc/munin/tahoe_server_operations_
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # graph operations-per-second from a set of storage servers.
 
diff --git a/misc/munin/tahoe_spacetime b/misc/munin/tahoe_spacetime
index 12e44d14..520a5fab 100644
--- a/misc/munin/tahoe_spacetime
+++ b/misc/munin/tahoe_spacetime
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # copy .rrd files from a remote munin master host, sum the 'df' stats from a
 # list of hosts, use them to estimate a rate-of-change for the past month,
diff --git a/misc/munin/tahoe_stats b/misc/munin/tahoe_stats
index f5c54936..bd03aaea 100644
--- a/misc/munin/tahoe_stats
+++ b/misc/munin/tahoe_stats
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import os
 import pickle
diff --git a/misc/munin/tahoe_storagespace b/misc/munin/tahoe_storagespace
index ad4375b9..5d25799c 100644
--- a/misc/munin/tahoe_storagespace
+++ b/misc/munin/tahoe_storagespace
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 # This is a munin plugin to track the amount of disk space each node's
 # StorageServer is consuming on behalf of other nodes. This is where the
diff --git a/misc/pyver.py b/misc/pyver.py
index aea81100..d53db165 100644
--- a/misc/pyver.py
+++ b/misc/pyver.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import sys
 print "python%d.%d" % (sys.version_info[:2])
diff --git a/misc/storage-overhead.py b/misc/storage-overhead.py
index f5495dd1..75a0bf61 100644
--- a/misc/storage-overhead.py
+++ b/misc/storage-overhead.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import sys, math
 from allmydata import upload, uri, encode, storage
diff --git a/misc/sub-ver.py b/misc/sub-ver.py
index 6c549604..6a1392cb 100644
--- a/misc/sub-ver.py
+++ b/misc/sub-ver.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 from allmydata import __version__ as v
 
diff --git a/misc/test-darcs-boringfile.py b/misc/test-darcs-boringfile.py
index 4c53c9f9..619a4e44 100644
--- a/misc/test-darcs-boringfile.py
+++ b/misc/test-darcs-boringfile.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 import sys
 from subprocess import Popen, PIPE
diff --git a/misc/xfer-client.py b/misc/xfer-client.py
index 44b0c856..e7af4803 100644
--- a/misc/xfer-client.py
+++ b/misc/xfer-client.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 """This program is a client that sends files to xfer-server.py. You give it
 the server's FURL, and it can put files into the server's targetdir (and
diff --git a/src/allmydata/test/check_grid.py b/src/allmydata/test/check_grid.py
index 46658698..67ffd306 100644
--- a/src/allmydata/test/check_grid.py
+++ b/src/allmydata/test/check_grid.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 """
 Test an existing Tahoe grid, both to see if the grid is still running and to
diff --git a/src/allmydata/test/check_load.py b/src/allmydata/test/check_load.py
index 6b4d2cd5..3097e34c 100644
--- a/src/allmydata/test/check_load.py
+++ b/src/allmydata/test/check_load.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 
 """
 this is a load-generating client program. It does all of its work through a