From: Andrew Dunstan <andrew@dunslane.net>
Date: Tue, 14 Apr 2020 20:47:07 +0000 (-0400)
Subject: Set Perl search path more idiomatically
X-Git-Tag: REL_13_BETA1~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e60c6f6ea17b50833242653fe2781f6d47429540;p=thirdparty%2Fpostgresql.git

Set Perl search path more idiomatically

Back in commits 1df92eeafe, f884a96819, and 592123efbb I used some
hackish code to set the script search path, unaware despite decades of
perl that there was a completely standard way to do this. This patch
changes those cases to use the standard perl FindBin package.
---

diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index da341245954..8e03af4ffcd 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -17,9 +17,8 @@ use strict;
 use warnings;
 use Getopt::Long;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Catalog;
 
diff --git a/src/tools/msvc/build.pl b/src/tools/msvc/build.pl
index 3c886fcd499..de50554e7e1 100644
--- a/src/tools/msvc/build.pl
+++ b/src/tools/msvc/build.pl
@@ -5,9 +5,8 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Cwd;
 
diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl
index e7ac6d1afa0..66c42557d4d 100755
--- a/src/tools/msvc/install.pl
+++ b/src/tools/msvc/install.pl
@@ -6,9 +6,8 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Install qw(Install);
 
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index a5e99dd0dea..2e396c06726 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -7,9 +7,8 @@
 use strict;
 use warnings;
 
-use File::Basename;
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Mkvcbuild;
 
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index c39178a93ca..f95f7a5c7ab 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -12,8 +12,9 @@ use File::Basename;
 use File::Copy;
 use File::Find ();
 use File::Path qw(rmtree);
-use File::Spec;
-BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+
+use FindBin;
+use lib $FindBin::RealBin;
 
 use Install qw(Install);