From f6d13407fa22dcb8585bf261de8ebd4d0720e482 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Wed, 27 Nov 2019 21:40:37 +0000
Subject: [PATCH] contrib/scripts: use awk to modify interpreter substitution
 lines.

---
 contrib/scripts/Makefile.am                                 | 2 +-
 contrib/scripts/gnunet-chk.py.in                            | 2 +-
 contrib/scripts/gnunet-logread/Makefile.am                  | 2 +-
 contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in | 2 +-
 contrib/scripts/gnunet-logread/gnunet-logread.in            | 2 +-
 contrib/scripts/gnunet_janitor.py.in                        | 2 +-
 contrib/scripts/gnunet_pyexpect.py.in                       | 2 +-
 contrib/scripts/pydiffer.py.in                              | 2 +-
 contrib/scripts/removetrailingwhitespace.py.in              | 2 +-
 contrib/scripts/terminate.py.in                             | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
index 91b2bcd5a..367e5c4c9 100644
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 CLEANFILES = \
   $(noinst_SCRIPTS)
 
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+do_subst = $(AWK) -v py="$(PYTHON)" '{gsub("@PYTHONEXE@",py); print $$0}'
 
 # Use SUFFIX Extension rules, they are more portable for every
 # implementation of 'make'.
diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in
index 7d2cf73d3..afc0924f4 100755
--- a/contrib/scripts/gnunet-chk.py.in
+++ b/contrib/scripts/gnunet-chk.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 # This file is part of GNUnet.
 # (C) 2013, 2018 Christian Grothoff (and other contributing authors)
 #
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
index 7903c07de..790b58fea 100644
--- a/contrib/scripts/gnunet-logread/Makefile.am
+++ b/contrib/scripts/gnunet-logread/Makefile.am
@@ -1,7 +1,7 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
-do_subst = $(SED) -e 's,[@]PERL[@],$(PERL),g'
+do_subst = $(AWK) -v py="$(PERL)" '{gsub("@PERLEXE@",py); print $$0}'
 
 SUFFIXES = .in
 
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
index f8b7dc735..72a1551ae 100755
--- a/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
+++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@PERLEXE@
 
 # 1. Start sdedit and enable 'RT diagram server' in 'Global preferences'.
 #
diff --git a/contrib/scripts/gnunet-logread/gnunet-logread.in b/contrib/scripts/gnunet-logread/gnunet-logread.in
index 9b1c65401..e27c1d3fc 100755
--- a/contrib/scripts/gnunet-logread/gnunet-logread.in
+++ b/contrib/scripts/gnunet-logread/gnunet-logread.in
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@PERLEXE@
 # helper tool to make gnunet logs more readable
 # try 'gnunet-logread -h' for usage
 
diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in
index d6834bfb4..9d28d38e6 100644
--- a/contrib/scripts/gnunet_janitor.py.in
+++ b/contrib/scripts/gnunet_janitor.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #    This file is part of GNUnet.
 #    (C) 2011, 2018 Christian Grothoff (and other contributing authors)
 #
diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in
index 48f8acdc1..1124dc33c 100644
--- a/contrib/scripts/gnunet_pyexpect.py.in
+++ b/contrib/scripts/gnunet_pyexpect.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #    This file is part of GNUnet.
 #    (C) 2010, 2018 Christian Grothoff (and other contributing authors)
 #
diff --git a/contrib/scripts/pydiffer.py.in b/contrib/scripts/pydiffer.py.in
index 08f0f4ae6..5235df3f7 100644
--- a/contrib/scripts/pydiffer.py.in
+++ b/contrib/scripts/pydiffer.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 
 import os
 import sys
diff --git a/contrib/scripts/removetrailingwhitespace.py.in b/contrib/scripts/removetrailingwhitespace.py.in
index e6c2d9014..6a133ecd0 100755
--- a/contrib/scripts/removetrailingwhitespace.py.in
+++ b/contrib/scripts/removetrailingwhitespace.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 
 import sys
 import re
diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in
index 2cb4a13c4..c82fdc981 100644
--- a/contrib/scripts/terminate.py.in
+++ b/contrib/scripts/terminate.py.in
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!@PYTHONEXE@
 #    This file is part of GNUnet.
 #    (C) 2011, 2018 Christian Grothoff (and other contributing authors)
 #
-- 
2.25.1