From 088096d1bad51428a2e2d487214995d4fdfc7ccc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 24 Mar 2010 16:50:50 +1100 Subject: [PATCH] python: use '#!/usr/bin/env python' to cope with varying install locations this should be much more portable --- lib/subunit/python/subunit/run.py | 2 +- lib/tdb/python/tdbdump.py | 2 +- lib/tdb/python/tests/simple.py | 2 +- source4/lib/ldb/tests/python/acl.py | 2 +- source4/lib/ldb/tests/python/api.py | 2 +- source4/lib/ldb/tests/python/deletetest.py | 2 +- source4/lib/ldb/tests/python/ldap.py | 2 +- source4/lib/ldb/tests/python/ldap_schema.py | 2 +- source4/lib/ldb/tests/python/sec_descriptor.py | 2 +- source4/lib/ldb/tests/python/urgent_replication.py | 2 +- source4/lib/messaging/tests/bindings.py | 2 +- source4/lib/registry/tests/bindings.py | 2 +- source4/libcli/security/tests/bindings.py | 2 +- source4/scripting/bin/autoidl | 2 +- source4/scripting/bin/enablerecyclebin | 2 +- source4/scripting/bin/fullschema | 2 +- source4/scripting/bin/get-descriptors | 2 +- source4/scripting/bin/machineaccountccache | 2 +- source4/scripting/bin/minschema | 2 +- source4/scripting/bin/rebuildextendeddn | 2 +- source4/scripting/bin/rpcclient | 2 +- source4/scripting/bin/samba3dump | 2 +- source4/scripting/bin/samba_dnsupdate | 2 +- source4/scripting/bin/smbstatus | 2 +- source4/scripting/bin/subunitrun | 2 +- source4/scripting/bin/upgradeprovision | 2 +- source4/scripting/bin/w32err_code.py | 2 +- source4/scripting/devel/ldapcmp | 2 +- source4/setup/provision | 2 +- source4/setup/upgrade_from_s3 | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py index 01c0b0e9e6b..e57939fdfa5 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 2007 diff --git a/lib/tdb/python/tdbdump.py b/lib/tdb/python/tdbdump.py index d759d771c87..01859ebce26 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 c7443c0d433..1c5982b1a42 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 06136894e7e..e4c531af30d 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 956908d7d69..001739bd536 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 diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/lib/ldb/tests/python/deletetest.py index 3fe28a389d6..13bec7efae5 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 6d01fcd370e..5e840308b32 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 201711d7146..4ed1d1c3b42 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 84edd90f7df..4d03c0bd941 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 752a95e1b42..b8df072bf3f 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 ead7a83afde..8240a364b02 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 8c3233ef1eb..b5115aefa42 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 2007 diff --git a/source4/libcli/security/tests/bindings.py b/source4/libcli/security/tests/bindings.py index 6fe3d5471d6..1869728fbf9 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 2007 diff --git a/source4/scripting/bin/autoidl b/source4/scripting/bin/autoidl index eed4ba3a80b..313ab4babda 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 0d39fe7758a..61ad32cd495 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 4a01b6aed0d..2f7d32c075f 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 f22500b0ba2..65be2fee6c6 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 5458851360e..7731f5af359 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 43f7816116e..6fca074d53f 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 5ae27aa027c..eed3a17edf4 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 aba4f9ddb3e..68b33fe6380 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 c11f8dbd0d7..0edbf6e8d25 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 4fdd10de0ac..4d54ab4f4cb 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 a9265ead6af..16559e7ce23 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 6cd3943786a..63afdc70092 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 2007 diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 180786abe3d..0e3f86db77e 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 2009 diff --git a/source4/scripting/bin/w32err_code.py b/source4/scripting/bin/w32err_code.py index cad6f6ecc9f..4ca6413e942 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 2009 diff --git a/source4/scripting/devel/ldapcmp b/source4/scripting/devel/ldapcmp index 9258e9c2951..5864ccb8375 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 993275930e5..d8e2eb244b0 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 b3bf5e7bb7a..7f31a0f0e93 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 -- 2.34.1