From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 29 Mar 2007 21:01:28 +0000 (-0700)
Subject: change #!/usr/bin/python to #!/usr/bin/env python
X-Git-Url: https://git.rkrishnan.org/pf/content/en.html?a=commitdiff_plain;h=4b4f5bbcba39c1b62c013b1138f0ad43883c7213;p=tahoe-lafs%2Ftahoe-lafs.git

change #!/usr/bin/python to #!/usr/bin/env python
Note that using "whatever version of python the name 'python' maps to in the current shell environment" is more error-prone that specifying which python you mean, such as by executing "/usr/bin/python setup.py" instead of executing "./setup.py".  When you build tahoe (by running "make") it will make a copy of bin/allmydata-tahoe in instdir/bin/allmydata-tahoe with the shebang line rewritten to execute the specific version of python that was used when building instead of to execute "/usr/bin/env python".

However, it seems better that the default for lazy people be "whatever 'python' means currently" instead of "whatever 'python' meant to the manufacturer of your operating system".
---

diff --git a/bin/allmydata-tahoe b/bin/allmydata-tahoe
index 57d4ebc6..8958528e 100644
--- a/bin/allmydata-tahoe
+++ b/bin/allmydata-tahoe
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 from allmydata.scripts import runner
 runner.run()
diff --git a/misc/figleaf2el.py b/misc/figleaf2el.py
index c32f3782..30a6bdfa 100644
--- a/misc/figleaf2el.py
+++ b/misc/figleaf2el.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import os, sys, pickle
 
diff --git a/misc/getmem.py b/misc/getmem.py
index 171340d2..8ddc3ed7 100644
--- a/misc/getmem.py
+++ b/misc/getmem.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from foolscap import Tub
 from foolscap.eventual import eventually
diff --git a/setup.py b/setup.py
index 16f34be9..0bdb1370 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from distutils.core import setup
 from distutils.core import Extension
diff --git a/simulator.py b/simulator.py
index 81ad3418..5a53fadb 100644
--- a/simulator.py
+++ b/simulator.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import sha as shamodule
 import os, random
diff --git a/sizes.py b/sizes.py
index 6e251989..5d7eec04 100644
--- a/sizes.py
+++ b/sizes.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import random, math, os, re
 from twisted.python import usage
diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py
index c4fe8edb..b2d79ff1 100644
--- a/src/allmydata/scripts/runner.py
+++ b/src/allmydata/scripts/runner.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import os, sys, signal, time
 from twisted.python import usage
diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py
index 2a3d2452..4745c4a2 100644
--- a/src/allmydata/test/check_memory.py
+++ b/src/allmydata/test/check_memory.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 import os, shutil
 
diff --git a/src/allmydata/test/test_encode.py b/src/allmydata/test/test_encode.py
index 5af27b7f..c220ba9a 100644
--- a/src/allmydata/test/test_encode.py
+++ b/src/allmydata/test/test_encode.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from twisted.trial import unittest
 from twisted.internet import defer
diff --git a/twisted/plugins/allmydata_trial.py b/twisted/plugins/allmydata_trial.py
index 08fd3759..93af3802 100644
--- a/twisted/plugins/allmydata_trial.py
+++ b/twisted/plugins/allmydata_trial.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python
 
 from zope.interface import implements
 from twisted.trial.itrial import IReporter