28 files changed, 28 insertions, 28 deletions
diff --git a/md2man b/md2man
index a459e36c..7dbb1f31 100755
--- a/md2man
+++ b/md2man
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # This script takes a manpage written in markdown and turns it into an html web
 # page and a nroff man page.  The input file must have the name of the program
diff --git a/packaging/branch-from-patch b/packaging/branch-from-patch
index c4982d03..91b9466b 100755
--- a/packaging/branch-from-patch
+++ b/packaging/branch-from-patch
@@ -1,4 +1,4 @@
-#!/usr/bin/python3 -B
+#!/usr/bin/env python3 -B
 
 # This script turns one or more diff files in the patches dir (which is
 # expected to be a checkout of the rsync-patches git repo) into a branch
diff --git a/packaging/cull_options b/packaging/cull_options
index c32a84dd..7588002b 100755
--- a/packaging/cull_options
+++ b/packaging/cull_options
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This script outputs some perl code that parses all possible options
 # that the code in options.c might send to the server.  This perl code
 # is included in the rrsync script.
diff --git a/packaging/md2html b/packaging/md2html
index 6475434c..e4ee226a 100755
--- a/packaging/md2html
+++ b/packaging/md2html
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # Copyright (C) 2020 Wayne Davison
 #
diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 587942f5..f971088f 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -1,4 +1,4 @@
-#!/usr/bin/python3 -B
+#!/usr/bin/env python3 -B
 
 # This script expects the directory ~/samba-rsync-ftp to exist and to be a
 # copy of the /home/ftp/pub/rsync dir on samba.org.  It also requires a
diff --git a/packaging/patch-update b/packaging/patch-update
index 1b6f1ea9..255a8c25 100755
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -1,4 +1,4 @@
-#!/usr/bin/python3 -B
+#!/usr/bin/env python3 -B
 
 # This script is used to turn one or more of the "patch/BASE/*" branches
 # into one or more diffs in the "patches" directory.  Pass the option
diff --git a/packaging/release-rsync b/packaging/release-rsync
index c54862ba..11a4fd54 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -1,4 +1,4 @@
-#!/usr/bin/python3 -B
+#!/usr/bin/env python3 -B
 
 # This script expects the directory ~/samba-rsync-ftp to exist and to be a
 # copy of the /home/ftp/pub/rsync dir on samba.org.  When the script is done,
diff --git a/packaging/var-checker b/packaging/var-checker
index 6b472f71..6468ac7a 100755
--- a/packaging/var-checker
+++ b/packaging/var-checker
@@ -1,4 +1,4 @@
-#!/usr/bin/python3 -B
+#!/usr/bin/env python3 -B
 
 # This script checks the *.c files for extraneous "extern" variables,
 # for vars that are defined but not used, and for inconsistent array
diff --git a/packaging/year-tweak b/packaging/year-tweak
index a8792816..69d2f2ff 100755
--- a/packaging/year-tweak
+++ b/packaging/year-tweak
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # This uses the output from "support/git-set-file-times --list" to discern
 # the last-modified year of each *.c & *.h file and updates the copyright
diff --git a/rsync-ssl b/rsync-ssl
index 4e066ade..8101975a 100755
--- a/rsync-ssl
+++ b/rsync-ssl
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script uses openssl, gnutls, or stunnel to secure an rsync daemon connection.
 
diff --git a/support/atomic-rsync b/support/atomic-rsync
index 79c2edfe..0346fb49 100755
--- a/support/atomic-rsync
+++ b/support/atomic-rsync
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # This script lets you update a hierarchy of files in an atomic way by
 # first creating a new hierarchy using rsync's --link-dest option, and
diff --git a/support/cvs2includes b/support/cvs2includes
index 33981de7..fc7f78fb 100755
--- a/support/cvs2includes
+++ b/support/cvs2includes
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # This script finds all CVS/Entries files in the current directory and below
 # and creates a local .cvsinclude file with non-inherited rules including each
diff --git a/support/deny-rsync b/support/deny-rsync
index 1993e3aa..bd4da9e7 100755
--- a/support/deny-rsync
+++ b/support/deny-rsync
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Send an error message via the rsync-protocol to a non-daemon client rsync.
 #
 # Usage:  deny-rsync "message"
diff --git a/support/file-attr-restore b/support/file-attr-restore
index a053e1d9..2e4a21b7 100755
--- a/support/file-attr-restore
+++ b/support/file-attr-restore
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This script will parse the output of "find ARG [ARG...] -ls" and
 # apply (at your discretion) the permissions, owner, and group info
 # it reads onto any existing files and dirs (it doesn't try to affect
diff --git a/support/files-to-excludes b/support/files-to-excludes
index 5fb13b08..a28955cb 100755
--- a/support/files-to-excludes
+++ b/support/files-to-excludes
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This script takes an input of filenames and outputs a set of
 # include/exclude directives that can be used by rsync to copy
 # just the indicated files using an --exclude-from=FILE option.
diff --git a/support/git-set-file-times b/support/git-set-file-times
index 4a20d441..b4c98c5d 100755
--- a/support/git-set-file-times
+++ b/support/git-set-file-times
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 import os, re, argparse, subprocess
 from datetime import datetime
diff --git a/support/instant-rsyncd b/support/instant-rsyncd
index e9efb1ab..8bcfd001 100755
--- a/support/instant-rsyncd
+++ b/support/instant-rsyncd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # instant-rsyncd lets you quickly set up and start a simple, unprivileged rsync
 # daemon with a single module in the current directory.  I've found it
diff --git a/support/logfilter b/support/logfilter
index 282914aa..29cfe690 100755
--- a/support/logfilter
+++ b/support/logfilter
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Filter the rsync daemon log messages by module name.  The log file can be
 # in either syslog format or rsync's own log-file format.  Note that the
 # MODULE_NAME parameter is used in a regular-expression match in order to
diff --git a/support/lsh b/support/lsh
index 81a593b6..40f70c88 100755
--- a/support/lsh
+++ b/support/lsh
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This script can be used as a "remote shell" command that is only
 # capable of pretending to connect to "localhost".  This is useful
 # for testing or for running a local copy where the sender and the
diff --git a/support/mapfrom b/support/mapfrom
index ca3b8173..88946bc0 100755
--- a/support/mapfrom
+++ b/support/mapfrom
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This helper script makes it easy to use a passwd or group file to map
 # values in a LOCAL transfer.  For instance, if you mount a backup that
 # does not have the same passwd setup as the local machine, you can do
diff --git a/support/mapto b/support/mapto
index a1dbe3c1..95887523 100755
--- a/support/mapto
+++ b/support/mapto
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This helper script makes it easy to use a passwd or group file to map
 # values in a LOCAL transfer.  For instance, if you mount a backup that
 # does not have the same passwd setup as the local machine, you can do
diff --git a/support/mnt-excl b/support/mnt-excl
index b2926db4..ed7b49ba 100755
--- a/support/mnt-excl
+++ b/support/mnt-excl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This script takes a command-line arg of a source directory
 # that will be passed to rsync, and generates a set of excludes
 # that will exclude all mount points from the list.  This is
diff --git a/support/munge-symlinks b/support/munge-symlinks
index 2aa27f36..3e5f3ad2 100755
--- a/support/munge-symlinks
+++ b/support/munge-symlinks
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # This script will either prefix all symlink values with the string
 # "/rsyncd-munged/" or remove that prefix.
 
diff --git a/support/rrsync b/support/rrsync
index a0ba074d..34e62300 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # Name: /usr/local/bin/rrsync (should also have a symlink in /usr/bin)
 # Purpose: Restricts rsync to subdirectory declared in .ssh/authorized_keys
 # Author: Joe Smith <js-cgi@inwap.com> 30-Sep-2004
diff --git a/support/rsync-no-vanished b/support/rsync-no-vanished
index 1cce75cb..cc3c29ce 100755
--- a/support/rsync-no-vanished
+++ b/support/rsync-no-vanished
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 IGNOREEXIT=24
 IGNOREOUT='^(file has vanished: |rsync warning: some files vanished before they could be transferred)'
diff --git a/support/rsync-slash-strip b/support/rsync-slash-strip
index 43b82bf4..2869e45c 100755
--- a/support/rsync-slash-strip
+++ b/support/rsync-slash-strip
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This script can be used as an rsync command-line filter that strips a single
 # trailing slash from each arg.  That treats "src/" the same as "src", thus
 # you need to use "src/." or "src//" for just the contents of the "src" dir.
diff --git a/support/rsyncstats b/support/rsyncstats
index ab7246d3..99fd5457 100755
--- a/support/rsyncstats
+++ b/support/rsyncstats
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # This script parses the default logfile format produced by rsync when running
 # as a daemon with transfer logging enabled.  It also parses a slightly tweaked
diff --git a/testhelp/maketree.py b/testhelp/maketree.py
index d71779ac..19ae71d1 100644
--- a/testhelp/maketree.py
+++ b/testhelp/maketree.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.2
+#!/usr/bin/env python2
 
 # Copyright (C) 2002 by Martin Pool <mbp@samba.org>