From 1560bf4181c05ae991b6f89b72559e69cf10252e Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Mon, 24 Sep 2018 13:59:53 +0200
Subject: [PATCH] Use canonical path for Perl

Samba codebase mostly uses '#!/usr/bin/perl' as perl's shbang.

This ensures uniform Perl modules availibility.

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
---
 examples/misc/wall.perl      | 2 +-
 pidl/pidl                    | 2 +-
 script/show_testsuite_time   | 2 +-
 source3/script/findsmb.in    | 2 +-
 source3/script/wscript_build | 5 +----
 source4/script/buildtree.pl  | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/examples/misc/wall.perl b/examples/misc/wall.perl
index efa4ee5ae44..72d6e8944dd 100644
--- a/examples/misc/wall.perl
+++ b/examples/misc/wall.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl
+#!/usr/bin/perl
 # 
 #@(#) smb-wall.pl Description:
 #@(#) A perl script which allows you to announce whatever you choose to
diff --git a/pidl/pidl b/pidl/pidl
index 78834144781..1f7b7e53af0 100755
--- a/pidl/pidl
+++ b/pidl/pidl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 ###################################################
 # package to parse IDL files and generate code for
diff --git a/script/show_testsuite_time b/script/show_testsuite_time
index 6e5808a0115..570b35de6ab 100755
--- a/script/show_testsuite_time
+++ b/script/show_testsuite_time
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 use Time::Local ('timegm');
 my $in = STDIN;
 use strict;
diff --git a/source3/script/findsmb.in b/source3/script/findsmb.in
index 38a6e2a1604..050025448cf 100755
--- a/source3/script/findsmb.in
+++ b/source3/script/findsmb.in
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 #
 # Prints info on all smb responding machines on a subnet.
 # This script needs to be run on a machine without nmbd running and be
diff --git a/source3/script/wscript_build b/source3/script/wscript_build
index 40ecdd7ef50..ca159e6aa0e 100644
--- a/source3/script/wscript_build
+++ b/source3/script/wscript_build
@@ -11,13 +11,10 @@ bld.SAMBA_SCRIPT('smbaddshare', pattern='smbaddshare', installdir='.')
 bld.SAMBA_SCRIPT('smbchangeshare', pattern='smbchangeshare', installdir='.')
 bld.SAMBA_SCRIPT('smbdeleteshare', pattern='smbdeleteshare', installdir='.')
 
-sed_expr1 = 's#@PERL@#/usr/bin/env perl#'
-sed_expr2 = 's#@BINDIR@#${BINDIR}#'
-
 bld.SAMBA_GENERATOR('findsmb-script',
                     source='findsmb.in',
                     target='findsmb',
-                    rule='sed -e "%s" -e "%s" ${SRC} > ${TGT}' % (sed_expr1, sed_expr2))
+                    rule='sed -e "s#@BINDIR@#${BINDIR}#" ${SRC} > ${TGT}')
 
 bld.INSTALL_FILES('${BINDIR}',
                   'findsmb',
diff --git a/source4/script/buildtree.pl b/source4/script/buildtree.pl
index a40036aa55c..358b18db6cd 100755
--- a/source4/script/buildtree.pl
+++ b/source4/script/buildtree.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl -w
+#!/usr/bin/perl -w
     eval 'exec /usr/bin/env perl -S $0 ${1+"$@"}'
         if 0; #$running_under_some_shell