python: use '#!/usr/bin/env python' to cope with varying install locations

this should be much more portable

diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py
index 01c0b0e9e6b35911b06db3e3a534769a1cbe41de..e57939fdfa52d8041c549697e7cfdb3cf1c5f11e 100755 (executable)
--- a/lib/subunit/python/subunit/run.py
+++ b/lib/subunit/python/subunit/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Simple subunit testrunner for python
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007

diff --git a/lib/tdb/python/tdbdump.py b/lib/tdb/python/tdbdump.py
index d759d771c872661db207a161be7624b06577de4f..01859ebce267baa71edb52fba10bee081dd7c67c 100644 (file)
--- a/lib/tdb/python/tdbdump.py
+++ b/lib/tdb/python/tdbdump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Trivial reimplementation of tdbdump in Python
 
 import tdb, sys

diff --git a/lib/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
index c7443c0d433526054190c6ce80d66e4866196cb9..1c5982b1a42bab6c6c74622dd8e674fc77604b23 100644 (file)
--- a/lib/tdb/python/tests/simple.py
+++ b/lib/tdb/python/tests/simple.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Some simple tests for the Python bindings for TDB
 # Note that this tests the interface of the Python bindings
 # It does not test tdb itself.

diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/lib/ldb/tests/python/acl.py
index 06136894e7e10fd5c6c722d10f618d2f84d24791..e4c531af30d3d41ee3a4c495d8adcda48edbaff6 100755 (executable)
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/lib/ldb/tests/python/acl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # This is unit with tests for LDAP access checks
 

diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py
index 956908d7d6946e26f53b400678da4f7a1f5cb1da..001739bd5361033f3c403219c5d238e729d85bf4 100755 (executable)
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Simple tests for the ldb python bindings.
 # Copyright (C) 2007 Jelmer Vernooij <jelmer@samba.org>
 

diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/lib/ldb/tests/python/deletetest.py
index 3fe28a389d62b37f57f58f73adb0799669d9a210..13bec7efae56569453e9bd3d925261b271855ab1 100755 (executable)
--- a/source4/lib/ldb/tests/python/deletetest.py
+++ b/source4/lib/ldb/tests/python/deletetest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import getopt

diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 6d01fcd370e1ef1f656ccde9562ba1739d3e29d3..5e840308b3286679cedb6616177c7dc2f76ac16d 100755 (executable)
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # This is a port of the original in testprogs/ejs/ldap.js
 

diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/lib/ldb/tests/python/ldap_schema.py
index 201711d714644c9aa9db8095b4e9f7781332102b..4ed1d1c3b42bc5b8b67d64babd4d0b5956ffc1e6 100755 (executable)
--- a/source4/lib/ldb/tests/python/ldap_schema.py
+++ b/source4/lib/ldb/tests/python/ldap_schema.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # This is a port of the original in testprogs/ejs/ldap.js
 

diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py
index 84edd90f7dfa7aaf3f1401aad08699aa4762f8f0..4d03c0bd941cdad00d4e46974a139e09f51699af 100755 (executable)
--- a/source4/lib/ldb/tests/python/sec_descriptor.py
+++ b/source4/lib/ldb/tests/python/sec_descriptor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import getopt

diff --git a/source4/lib/ldb/tests/python/urgent_replication.py b/source4/lib/ldb/tests/python/urgent_replication.py
index 752a95e1b42805eaff85133aa6c654320068ce81..b8df072bf3f596263cb0c7e0793668dff4413460 100755 (executable)
--- a/source4/lib/ldb/tests/python/urgent_replication.py
+++ b/source4/lib/ldb/tests/python/urgent_replication.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # This is a port of the original in testprogs/ejs/ldap.js
 

diff --git a/source4/lib/messaging/tests/bindings.py b/source4/lib/messaging/tests/bindings.py
index ead7a83afdef855a22a71061435e16f561f8ba0b..8240a364b0292aded58001eca7e3e2d4dd4691ed 100644 (file)
--- a/source4/lib/messaging/tests/bindings.py
+++ b/source4/lib/messaging/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Unix SMB/CIFS implementation.

diff --git a/source4/lib/registry/tests/bindings.py b/source4/lib/registry/tests/bindings.py
index 8c3233ef1eb9951f80d0c56b3d3b535bce018869..b5115aefa42080df41d80b80d511293921236f13 100644 (file)
--- a/source4/lib/registry/tests/bindings.py
+++ b/source4/lib/registry/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Unix SMB/CIFS implementation.
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007

diff --git a/source4/libcli/security/tests/bindings.py b/source4/libcli/security/tests/bindings.py
index 6fe3d5471d6513b55ec109b79e4998b50f1dc7ac..1869728fbf9914c94ca2654f3ad3078a26e9ccac 100644 (file)
--- a/source4/libcli/security/tests/bindings.py
+++ b/source4/libcli/security/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Unix SMB/CIFS implementation.
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007

diff --git a/source4/scripting/bin/autoidl b/source4/scripting/bin/autoidl
index eed4ba3a80bb1bbeded64f1e2828aa2fa546e7dd..313ab4babdab40d480d7babc342ce98ae8fc15be 100755 (executable)
--- a/source4/scripting/bin/autoidl
+++ b/source4/scripting/bin/autoidl
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Unix SMB/CIFS implementation.

diff --git a/source4/scripting/bin/enablerecyclebin b/source4/scripting/bin/enablerecyclebin
index 0d39fe7758aaea88d1fa2d4e395512e04a007e38..61ad32cd49530b58178c44f119ec2733baad8a63 100755 (executable)
--- a/source4/scripting/bin/enablerecyclebin
+++ b/source4/scripting/bin/enablerecyclebin
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # enabled the Recycle Bin optional feature
 #

diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema
index 4a01b6aed0dd09734ef97fda492e06621b006585..2f7d32c075f3f74c6f94123067338fd8000f7d71 100755 (executable)
--- a/source4/scripting/bin/fullschema
+++ b/source4/scripting/bin/fullschema
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # 
 # Works out the full schema
 #

diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors
index f22500b0ba2aa444dea740fdbf0702066b9ea36e..65be2fee6c6d123e716d18485374274e0b6645a4 100755 (executable)
--- a/source4/scripting/bin/get-descriptors
+++ b/source4/scripting/bin/get-descriptors
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Unix SMB/CIFS implementation.
 # A script to compare differences of security descriotors between

diff --git a/source4/scripting/bin/machineaccountccache b/source4/scripting/bin/machineaccountccache
index 5458851360e933217b54075f5fca56c90be7af8f..7731f5af359207a440b39403be8434c65d31022a 100755 (executable)
--- a/source4/scripting/bin/machineaccountccache
+++ b/source4/scripting/bin/machineaccountccache
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import optparse
 import sys
 

diff --git a/source4/scripting/bin/minschema b/source4/scripting/bin/minschema
index 43f7816116e7b68f31d39e65b7b9c46871032c20..6fca074d53fc01719ab414c9af8523d3e3973a5d 100755 (executable)
--- a/source4/scripting/bin/minschema
+++ b/source4/scripting/bin/minschema
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # 
 # Works out the minimal schema for a set of objectclasses
 #

diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn
index 5ae27aa027c27f10e0001769940c3a026ec696a4..eed3a17edf487666e6f1bba926f7cd8bfc63427e 100755 (executable)
--- a/source4/scripting/bin/rebuildextendeddn
+++ b/source4/scripting/bin/rebuildextendeddn
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Unix SMB/CIFS implementation.
 # Extended attributes (re)building

diff --git a/source4/scripting/bin/rpcclient b/source4/scripting/bin/rpcclient
index aba4f9ddb3e666c647802e15c139317052a88fc0..68b33fe638043b8f87a2e8f7f731972804d0220c 100755 (executable)
--- a/source4/scripting/bin/rpcclient
+++ b/source4/scripting/bin/rpcclient
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 import sys, os, string
 

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index c11f8dbd0d74b86b6034b706e74ef2dfb78ebe57..0edbf6e8d257c306d037d4455b475c77db2d9397 100755 (executable)
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 #    Dump Samba3 data
 #    Copyright Jelmer Vernooij 2005-2007

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 4fdd10de0ac692d83e704e42c4714522c36d549a..4d54ab4f4cb57430b1b973f6b5b5161cdfc4b259 100755 (executable)
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # update our DNS names using TSIG-GSS
 #

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index a9265ead6af554b7d4cc08e560bae169302ac43d..16559e7ce23b48da86d27ca3170735df396bcef8 100755 (executable)
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 #  provide information on connected users and open files

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 6cd3943786aded20ecdf7864b834ee119cb4bf2b..63afdc70092d4a61140ccce8d828a7c99033c859 100755 (executable)
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Simple subunit testrunner for python
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 180786abe3d69f3b3c9942b52e6ad40fd242a166..0e3f86db77e86616ff684b347c35d6b468e31d7d 100755 (executable)
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # vim: expandtab
 #
 # Copyright (C) Matthieu Patou <mat@matws.net> 2009

diff --git a/source4/scripting/bin/w32err_code.py b/source4/scripting/bin/w32err_code.py
index cad6f6ecc9f336a570560369e7aa1ccb2245dceb..4ca6413e942c47994f17848cbc0c8ef9e533119c 100755 (executable)
--- a/source4/scripting/bin/w32err_code.py
+++ b/source4/scripting/bin/w32err_code.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Unix SMB/CIFS implementation.
 # Copyright (C) Kamen Mazdrashki <kamen.mazdrashki@postpath.com> 2009

diff --git a/source4/scripting/devel/ldapcmp b/source4/scripting/devel/ldapcmp
index 9258e9c2951231e0b57f5a5f1705198aa08b013f..5864ccb83759abe171fe333fdfb281604bb9de8a 100755 (executable)
--- a/source4/scripting/devel/ldapcmp
+++ b/source4/scripting/devel/ldapcmp
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Unix SMB/CIFS implementation.
 # A script to compare differences of objects and attributes between

diff --git a/source4/setup/provision b/source4/setup/provision
index 993275930e54b392ae665b19139b13d8f9e7e66d..d8e2eb244b085d511cce4f8528e142341952fa31 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Unix SMB/CIFS implementation.
 # provision a Samba4 server

diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index b3bf5e7bb7a331a08bc4eb5b9515c29559b8f129..7f31a0f0e93f8e147520b84ade7dd9402b0d3c82 100755 (executable)
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Upgrade from Samba3
 # Copyright Jelmer Vernooij 2005-2007