In some installed python scripts /usr/bin/env is unnecessarily used in
shebang, replace it directly with @PYTHON@.
This will also avoid implicit dependency to /usr/bin/env in RPM distributions
and it will correctly add implicit dependency to /usr/bin/python instead.
Signed-off-by: Timothy Redaelli <tredae...@redhat.com>
---
ovn/utilities/ovn-detrace.in | 2 +-
utilities/ovs-check-dead-ifs.in | 2 +-
utilities/ovs-dpctl-top.in | 2 +-
utilities/ovs-l3ping.in | 2 +-
utilities/ovs-parse-backtrace.in | 2 +-
utilities/ovs-pcap.in | 2 +-
utilities/ovs-tcpdump.in | 2 +-
utilities/ovs-tcpundump.in | 2 +-
utilities/ovs-test.in | 2 +-
utilities/ovs-vlan-test.in | 2 +-
vtep/automake.mk | 2 +-
vtep/{ovs-vtep => ovs-vtep.in} | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
rename vtep/{ovs-vtep => ovs-vtep.in} (99%)
diff --git a/ovn/utilities/ovn-detrace.in b/ovn/utilities/ovn-detrace.in
index b5fd5d1a4..e2e5b4c2f 100755
--- a/ovn/utilities/ovn-detrace.in
+++ b/ovn/utilities/ovn-detrace.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2017 eBay Inc.
#
diff --git a/utilities/ovs-check-dead-ifs.in b/utilities/ovs-check-dead-ifs.in
index 127ba38a7..ac54f6c9c 100755
--- a/utilities/ovs-check-dead-ifs.in
+++ b/utilities/ovs-check-dead-ifs.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
import os
import re
diff --git a/utilities/ovs-dpctl-top.in b/utilities/ovs-dpctl-top.in
index 401a80eed..7f0f1f8c2 100755
--- a/utilities/ovs-dpctl-top.in
+++ b/utilities/ovs-dpctl-top.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2013 Nicira, Inc.
#
diff --git a/utilities/ovs-l3ping.in b/utilities/ovs-l3ping.in
index 38ac49157..1b0797295 100644
--- a/utilities/ovs-l3ping.in
+++ b/utilities/ovs-l3ping.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-parse-backtrace.in b/utilities/ovs-parse-backtrace.in
index c8a438557..350cbd9f8 100755
--- a/utilities/ovs-parse-backtrace.in
+++ b/utilities/ovs-parse-backtrace.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2012 Nicira, Inc.
#
diff --git a/utilities/ovs-pcap.in b/utilities/ovs-pcap.in
index c43acb52e..fc1532110 100755
--- a/utilities/ovs-pcap.in
+++ b/utilities/ovs-pcap.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2010 Nicira, Inc.
#
diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in
index 4bec53513..6718c77fe 100755
--- a/utilities/ovs-tcpdump.in
+++ b/utilities/ovs-tcpdump.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2016 Red Hat, Inc.
#
diff --git a/utilities/ovs-tcpundump.in b/utilities/ovs-tcpundump.in
index 46e1d7486..57300cdc1 100755
--- a/utilities/ovs-tcpundump.in
+++ b/utilities/ovs-tcpundump.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2010 Nicira, Inc.
#
diff --git a/utilities/ovs-test.in b/utilities/ovs-test.in
index 46ad6fad5..fb1f9ad2a 100644
--- a/utilities/ovs-test.in
+++ b/utilities/ovs-test.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-vlan-test.in b/utilities/ovs-vlan-test.in
index 7a8993699..e2294989f 100755
--- a/utilities/ovs-vlan-test.in
+++ b/utilities/ovs-vlan-test.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env @PYTHON@
+#! @PYTHON@
#
# Copyright (c) 2010 Nicira, Inc.
#
diff --git a/vtep/automake.mk b/vtep/automake.mk
index 6bcb03188..bd419cd33 100644
--- a/vtep/automake.mk
+++ b/vtep/automake.mk
@@ -40,7 +40,7 @@ vtep_vtep_ctl_LDADD = vtep/libvtep.la lib/libopenvswitch.la
scripts_SCRIPTS += \
vtep/ovs-vtep
-EXTRA_DIST += vtep/ovs-vtep
+EXTRA_DIST += vtep/ovs-vtep.in
FLAKE8_PYFILES += vtep/ovs-vtep
diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep.in
similarity index 99%
rename from vtep/ovs-vtep
rename to vtep/ovs-vtep.in
index 5153b3b8e..98748e448 100755
--- a/vtep/ovs-vtep
+++ b/vtep/ovs-vtep.in
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! @PYTHON@
# Copyright (C) 2013 Nicira, Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
--
2.13.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
