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

diff --git a/misc/count_dirs.py b/misc/count_dirs.py
index 0af03148e8a8955fb348bcede19a7f59e2c36bd1..78412d33bd564784a0910c18748466acddd6c14c 100644 (file)
--- 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 68cc8595fd6b73a07612224be3e1b058582b3755..68ac4b46a8e7e64ec111a76e3ab001ac55d9081c 100644 (file)
--- 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 f876afa0389113da411d881209bd6f6a10188ff9..76fe3419f2d47a5923b1bdfdcd592a4180dee15c 100644 (file)
--- 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 21b252432c9db108d6a8123ed1bada192024353c..a13132166d8e2b349b860a745a1cff6c28baadf8 100644 (file)
--- 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 f581067655af9cd734f1be1a80f18bdbb7f20670..a9a637a7c1ef4061808a7f490b972bc53a05bd61 100644 (file)
--- 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 ff61b6ab172b746ebd7cff6a1e447c71c51b7929..16ec40e6ae9b28b3b95b9a7789664a6bd33f936b 100644 (file)
--- 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 0baa6dd4df0f33630db2acba900304a5d66b483b..44f0348a4b75695018acb0128c68fa0eb7441994 100644 (file)
--- 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 c8b39dfe6208ba6c1ed78ceba849863f83b9390a..60aab23a09d1417f3dce230afd39ceec3c8d3ae4 100644 (file)
--- 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 1b1df335fd66e2762dd9ca207496916f0bd2cd5c..bd349cb2fa091e150c0b53de1d76867a240cf00d 100644 (file)
--- 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 8a177f6c7b9a1ef6c17d57a853556acf5110f03d..fc568bbeecd1ddae5496ab8059fb1a0aee156618 100644 (file)
--- 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 80b9df6ce7fd399b7e07d925b71eb8df837b3609..9810220f9d26562463c6fa17aa08f342283944f1 100644 (file)
--- 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 a46310261367bbde862a79ae1b9171293b2e797b..c8ab1c0ae0029170bddeaf77886b7178f8b3ae38 100644 (file)
--- 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 4723cdadaea461badf8adfcf7410242c54f8668d..249565e4dba2329809f38454fb530d90f5009ee0 100644 (file)
--- 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 c6026de19f409499d56179fadae608ebefbdd9f5..e68b59da68d4e1989ccd5878d19a8d040b6deed2 100644 (file)
--- 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 472c8c42dad9314804f74bd14351df7f6f58d9fb..3265e5f0a5e312e4a2c0e9d54db8356071a85e39 100644 (file)
--- 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 c64101dfeb6c7f772c2f9dcc0c24e8aee37c0952..1f807beb1f5128eaa7a04f699e851657481bddcd 100644 (file)
--- 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 5f506eb9d43df010e891b5c112407ecb4c0e5009..52c743c379b10eb7bcb3baab166c2948d47eb4bb 100644 (file)
--- 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 670e32e537df31c7d7b8eef37643dc91c2d205b5..fd3f8b0a47921c342a19d851e09f23812ed4995f 100644 (file)
--- 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 ba2e1ddf5ebccb7a3aea5bf4498cddef1fec28d9..266fe93994ce86923ff60a5c135efb1a39764d1f 100644 (file)
--- 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 e3830fe4019241a20f691382c8a49e32bb29fa74..c9acb3cb0c46a6eea4b91d93bb3645c220b3a5c0 100644 (file)
--- 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 a47fdf3116110010caa8b2a111a49ba40c896cbd..a63f902c85644cd195a1c33e123989ba9c89bc9d 100644 (file)
--- 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 c28490dad97101d66346ff5fa0b71d9a7cc3e32b..3f6247576ba8d66a03e546a544bccd22eb46b82c 100644 (file)
--- 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 12e44d146d9364c660451281200f72ff9964585a..520a5fabe71f2ba6272511deeffbb602aca008d1 100644 (file)
--- 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 f5c54936121eba501285f60df9745d378e509a9a..bd03aaeaca466f7e9e5cc606a96292514df8ba11 100644 (file)
--- 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 ad4375b97f676e6c007d87fd4a012e6753a43421..5d25799c6be4bf7f806000b81bfdc5b0f857ce88 100644 (file)
--- 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 aea81100d0441041b0522f0288639a4b8f6de290..d53db165e71e6b2a8d7af081f580d0aaecfdfd66 100644 (file)
--- 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 f5495dd1838dd007b298868b4139a6b1b5811636..75a0bf6185cc1101e53c5097b35e3250939de4e5 100644 (file)
--- 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 6c54960484fd9edfc2e8bca077f7837ba71102eb..6a1392cb96aa822be6684cc4ec4f74461e21efac 100644 (file)
--- 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 4c53c9f9d325586b69f8c520b7fcf6f16efc9a90..619a4e448c93db4d4b820fb7f33f009dddb46162 100644 (file)
--- 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 44b0c856b76fa278cf96af2ff6bacdfb76f6e286..e7af4803322c4a3ed690ecb25fd81e0ece888a8f 100644 (file)
--- 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 46658698e7bfb2d08e1cdf3d529dd844882ef05e..67ffd30619de21a3186e764be9d2ee0d9c8b90ff 100644 (file)
--- 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 6b4d2cd5f7d0bc8a54889bafd1f91c2033073a7a..3097e34c2c785da4c617ba284a2bb601e7aca50f 100644 (file)
--- 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