summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-24 16:50:50 +1100
committerAndrew Tridgell <tridge@samba.org>2010-03-25 14:37:19 +1100
commit088096d1bad51428a2e2d487214995d4fdfc7ccc (patch)
treeaa23f81cec36b9eb92f48f56576803a4c8e20d5d
parent845c2281c7513bd3139a8f50b593658b32dbdb31 (diff)
downloadsamba-088096d1bad51428a2e2d487214995d4fdfc7ccc.tar.gz
samba-088096d1bad51428a2e2d487214995d4fdfc7ccc.tar.bz2
samba-088096d1bad51428a2e2d487214995d4fdfc7ccc.zip
python: use '#!/usr/bin/env python' to cope with varying install locations
this should be much more portable
-rwxr-xr-xlib/subunit/python/subunit/run.py2
-rw-r--r--lib/tdb/python/tdbdump.py2
-rw-r--r--lib/tdb/python/tests/simple.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/acl.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/api.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/deletetest.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/ldap.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/ldap_schema.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/sec_descriptor.py2
-rwxr-xr-xsource4/lib/ldb/tests/python/urgent_replication.py2
-rw-r--r--source4/lib/messaging/tests/bindings.py2
-rw-r--r--source4/lib/registry/tests/bindings.py2
-rw-r--r--source4/libcli/security/tests/bindings.py2
-rwxr-xr-xsource4/scripting/bin/autoidl2
-rwxr-xr-xsource4/scripting/bin/enablerecyclebin2
-rwxr-xr-xsource4/scripting/bin/fullschema2
-rwxr-xr-xsource4/scripting/bin/get-descriptors2
-rwxr-xr-xsource4/scripting/bin/machineaccountccache2
-rwxr-xr-xsource4/scripting/bin/minschema2
-rwxr-xr-xsource4/scripting/bin/rebuildextendeddn2
-rwxr-xr-xsource4/scripting/bin/rpcclient2
-rwxr-xr-xsource4/scripting/bin/samba3dump2
-rwxr-xr-xsource4/scripting/bin/samba_dnsupdate2
-rwxr-xr-xsource4/scripting/bin/smbstatus2
-rwxr-xr-xsource4/scripting/bin/subunitrun2
-rwxr-xr-xsource4/scripting/bin/upgradeprovision2
-rwxr-xr-xsource4/scripting/bin/w32err_code.py2
-rwxr-xr-xsource4/scripting/devel/ldapcmp2
-rwxr-xr-xsource4/setup/provision2
-rwxr-xr-xsource4/setup/upgrade_from_s32
30 files changed, 30 insertions, 30 deletions
diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py
index 01c0b0e9e6..e57939fdfa 100755
--- 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 d759d771c8..01859ebce2 100644
--- 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 c7443c0d43..1c5982b1a4 100644
--- 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 06136894e7..e4c531af30 100755
--- 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 956908d7d6..001739bd53 100755
--- 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 3fe28a389d..13bec7efae 100755
--- 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 6d01fcd370..5e840308b3 100755
--- 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 201711d714..4ed1d1c3b4 100755
--- 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 84edd90f7d..4d03c0bd94 100755
--- 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 752a95e1b4..b8df072bf3 100755
--- 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 ead7a83afd..8240a364b0 100644
--- 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 8c3233ef1e..b5115aefa4 100644
--- 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 6fe3d5471d..1869728fbf 100644
--- 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 eed4ba3a80..313ab4babd 100755
--- 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 0d39fe7758..61ad32cd49 100755
--- 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 4a01b6aed0..2f7d32c075 100755
--- 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 f22500b0ba..65be2fee6c 100755
--- 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 5458851360..7731f5af35 100755
--- 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 43f7816116..6fca074d53 100755
--- 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 5ae27aa027..eed3a17edf 100755
--- 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 aba4f9ddb3..68b33fe638 100755
--- 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 c11f8dbd0d..0edbf6e8d2 100755
--- 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 4fdd10de0a..4d54ab4f4c 100755
--- 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 a9265ead6a..16559e7ce2 100755
--- 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 6cd3943786..63afdc7009 100755
--- 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 180786abe3..0e3f86db77 100755
--- 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 cad6f6ecc9..4ca6413e94 100755
--- 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 9258e9c295..5864ccb837 100755
--- 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 993275930e..d8e2eb244b 100755
--- 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 b3bf5e7bb7..7f31a0f0e9 100755
--- 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