From 51ce438f7ff112dddbef79e795a54485f29e9c18 Mon Sep 17 00:00:00 2001
From: David Goetz <david.goetz@rackspace.com>
Date: Thu, 24 Mar 2011 15:51:44 -0700
Subject: [PATCH] changing /usr/bin/python to /usr/bin/env python

---
 bin/st                         | 2 +-
 bin/swauth-add-account         | 2 +-
 bin/swauth-add-user            | 2 +-
 bin/swauth-cleanup-tokens      | 2 +-
 bin/swauth-delete-account      | 2 +-
 bin/swauth-delete-user         | 2 +-
 bin/swauth-list                | 2 +-
 bin/swauth-prep                | 2 +-
 bin/swauth-set-account-service | 2 +-
 bin/swift-account-audit        | 2 +-
 bin/swift-account-auditor      | 2 +-
 bin/swift-account-reaper       | 2 +-
 bin/swift-account-replicator   | 2 +-
 bin/swift-account-server       | 2 +-
 bin/swift-account-stats-logger | 2 +-
 bin/swift-bench                | 2 +-
 bin/swift-container-auditor    | 2 +-
 bin/swift-container-replicator | 2 +-
 bin/swift-container-server     | 2 +-
 bin/swift-container-updater    | 2 +-
 bin/swift-drive-audit          | 2 +-
 bin/swift-get-nodes            | 2 +-
 bin/swift-init                 | 2 +-
 bin/swift-log-stats-collector  | 2 +-
 bin/swift-log-uploader         | 2 +-
 bin/swift-object-auditor       | 2 +-
 bin/swift-object-info          | 2 +-
 bin/swift-object-replicator    | 2 +-
 bin/swift-object-server        | 2 +-
 bin/swift-object-updater       | 2 +-
 bin/swift-proxy-server         | 2 +-
 bin/swift-ring-builder         | 2 +-
 bin/swift-stats-populate       | 2 +-
 bin/swift-stats-report         | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/bin/st b/bin/st
index 4e6024f84f..b4b2aeeff6 100755
--- a/bin/st
+++ b/bin/st
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python -u
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-add-account b/bin/swauth-add-account
index 9f40429d00..2b91b6292d 100755
--- a/bin/swauth-add-account
+++ b/bin/swauth-add-account
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-add-user b/bin/swauth-add-user
index 365a24a085..23144df41b 100755
--- a/bin/swauth-add-user
+++ b/bin/swauth-add-user
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-cleanup-tokens b/bin/swauth-cleanup-tokens
index 5666f801c2..3ca86cd990 100755
--- a/bin/swauth-cleanup-tokens
+++ b/bin/swauth-cleanup-tokens
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-delete-account b/bin/swauth-delete-account
index 8e4bd42f76..66bdf2bbe1 100755
--- a/bin/swauth-delete-account
+++ b/bin/swauth-delete-account
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-delete-user b/bin/swauth-delete-user
index f2f7808b64..de3ac3b12b 100755
--- a/bin/swauth-delete-user
+++ b/bin/swauth-delete-user
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-list b/bin/swauth-list
index 217b5baff8..3f9ae5ea49 100755
--- a/bin/swauth-list
+++ b/bin/swauth-list
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-prep b/bin/swauth-prep
index ca47ff9faa..a7b912e60c 100755
--- a/bin/swauth-prep
+++ b/bin/swauth-prep
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swauth-set-account-service b/bin/swauth-set-account-service
index 538210e497..0317546df5 100755
--- a/bin/swauth-set-account-service
+++ b/bin/swauth-set-account-service
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-account-audit b/bin/swift-account-audit
index 9a19198853..73441c1ba9 100755
--- a/bin/swift-account-audit
+++ b/bin/swift-account-audit
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-account-auditor b/bin/swift-account-auditor
index 3dc4c17609..f654dbce94 100755
--- a/bin/swift-account-auditor
+++ b/bin/swift-account-auditor
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-account-reaper b/bin/swift-account-reaper
index c5df6f4c2f..e318b386c7 100755
--- a/bin/swift-account-reaper
+++ b/bin/swift-account-reaper
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-account-replicator b/bin/swift-account-replicator
index 3978dc0bee..2adbd9ac46 100755
--- a/bin/swift-account-replicator
+++ b/bin/swift-account-replicator
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-account-server b/bin/swift-account-server
index a4088fffb2..6a1e459b76 100755
--- a/bin/swift-account-server
+++ b/bin/swift-account-server
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-account-stats-logger b/bin/swift-account-stats-logger
index 6256b690b5..450a5deca4 100755
--- a/bin/swift-account-stats-logger
+++ b/bin/swift-account-stats-logger
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-bench b/bin/swift-bench
index 0554782a06..7d20ef353a 100755
--- a/bin/swift-bench
+++ b/bin/swift-bench
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-container-auditor b/bin/swift-container-auditor
index 9c29d4400b..d445840c1d 100755
--- a/bin/swift-container-auditor
+++ b/bin/swift-container-auditor
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-container-replicator b/bin/swift-container-replicator
index d8443afacd..d88f069655 100755
--- a/bin/swift-container-replicator
+++ b/bin/swift-container-replicator
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-container-server b/bin/swift-container-server
index 2dbfbba090..e154c51633 100755
--- a/bin/swift-container-server
+++ b/bin/swift-container-server
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-container-updater b/bin/swift-container-updater
index d1b1d5ffb5..16ff3f4e62 100755
--- a/bin/swift-container-updater
+++ b/bin/swift-container-updater
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-drive-audit b/bin/swift-drive-audit
index 77912e720e..d269b25414 100755
--- a/bin/swift-drive-audit
+++ b/bin/swift-drive-audit
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-get-nodes b/bin/swift-get-nodes
index b84119222c..e7d13817af 100755
--- a/bin/swift-get-nodes
+++ b/bin/swift-get-nodes
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-init b/bin/swift-init
index 96ed1f63f3..7389a864a2 100644
--- a/bin/swift-init
+++ b/bin/swift-init
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-log-stats-collector b/bin/swift-log-stats-collector
index 374af49a4f..b1ec382570 100755
--- a/bin/swift-log-stats-collector
+++ b/bin/swift-log-stats-collector
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-log-uploader b/bin/swift-log-uploader
index 6db2bb01f9..11562699ee 100755
--- a/bin/swift-log-uploader
+++ b/bin/swift-log-uploader
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-object-auditor b/bin/swift-object-auditor
index c01b05bf70..53494f4cba 100755
--- a/bin/swift-object-auditor
+++ b/bin/swift-object-auditor
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-object-info b/bin/swift-object-info
index 278a7de0f2..f1b559be87 100755
--- a/bin/swift-object-info
+++ b/bin/swift-object-info
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-object-replicator b/bin/swift-object-replicator
index 7ae5db81c1..d84d892b4b 100755
--- a/bin/swift-object-replicator
+++ b/bin/swift-object-replicator
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-object-server b/bin/swift-object-server
index 3f36882c5f..225c21dffc 100755
--- a/bin/swift-object-server
+++ b/bin/swift-object-server
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-object-updater b/bin/swift-object-updater
index 779a3b7306..56048de081 100755
--- a/bin/swift-object-updater
+++ b/bin/swift-object-updater
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-proxy-server b/bin/swift-proxy-server
index 6dae54e156..66c8dee8ee 100755
--- a/bin/swift-proxy-server
+++ b/bin/swift-proxy-server
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder
index fd24a1d93f..f2618f70ef 100755
--- a/bin/swift-ring-builder
+++ b/bin/swift-ring-builder
@@ -1,4 +1,4 @@
-#!/usr/bin/python -uO
+#!/usr/bin/env python -uO
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-stats-populate b/bin/swift-stats-populate
index b1f4f0a568..d47117db26 100755
--- a/bin/swift-stats-populate
+++ b/bin/swift-stats-populate
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python -u
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/bin/swift-stats-report b/bin/swift-stats-report
index 4c47b404de..3e4c21eabd 100755
--- a/bin/swift-stats-report
+++ b/bin/swift-stats-report
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python -u
 # Copyright (c) 2010-2011 OpenStack, LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");