tools: includes from relative or project paths

More perl v5.26 fixes similar to commit v1.10-63-g00ffc9287b (2018-03-05)
[fix includes from relative paths for perl v5.26], but restrict to project
environment unless relying on many file dependencies.

diff --git a/tools/lastword b/tools/lastword
index b8e94f94f6576ed2b1f9b941c4f94a6ad9b5ecfc..66709bf988f04e33bbec850431cfcc1139098d4c 100755 (executable)
--- a/tools/lastword
+++ b/tools/lastword
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S perl -ni
 use 5.014;
 use warnings;
 #!/usr/bin/env -S perl -ni
 use 5.014;
 use warnings;

-use lib '.';
+use lib $0 =~ s{[^/]+$}{..}r; # project root

 use Shiar_Sheet::DB;
 
 my $db = Shiar_Sheet::DB->connect;
 use Shiar_Sheet::DB;
 
 my $db = Shiar_Sheet::DB->connect;

diff --git a/tools/mkdigraphs-xorg b/tools/mkdigraphs-xorg
index 64c99d9648dffaabdf9dd6e5286f82d850a4f4f3..4d25445ba2a9bdeb61203891d7943820e7098e4f 100755 (executable)
--- a/tools/mkdigraphs-xorg
+++ b/tools/mkdigraphs-xorg
@@ -4,6 +4,7 @@ use warnings;
 use utf8;
 use open IO => ':encoding(utf-8)', ':std';
 use re '/msx';
 use utf8;
 use open IO => ':encoding(utf-8)', ':std';
 use re '/msx';

+use lib '.';

 use JSON 'decode_json';
 use Data::Dump 'pp';
 use Shiar_Sheet::FormatChar;
 use JSON 'decode_json';
 use Data::Dump 'pp';
 use Shiar_Sheet::FormatChar;

diff --git a/tools/mkjson b/tools/mkjson
index 3b1bfa9317cce5f17308fb44cc733fa7e26adb91..c2c89fde6be3ed6f823903375771a49e09cbdea4 100755 (executable)
--- a/tools/mkjson
+++ b/tools/mkjson
@@ -2,6 +2,7 @@
 use 5.012;
 use warnings;
 use re '/msx';
 use 5.012;
 use warnings;
 use re '/msx';

+use lib '.';

 use JSON;
 
 our $VERSION = '1.00';
 use JSON;
 
 our $VERSION = '1.00';

diff --git a/tools/mktermcol-xcolor b/tools/mktermcol-xcolor
index c705093924dc96748f18a56683d6863e285a390a..c59b7312150ad163228069163583243044450790 100755 (executable)
--- a/tools/mktermcol-xcolor
+++ b/tools/mktermcol-xcolor
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use 5.014;
 #!/usr/bin/env perl
 use 5.014;

-
-BEGIN { push @INC, '.'; }
+use warnings;
+use lib $0 =~ s{[^/]+$}{..}r; # project root

 use Shiar_Sheet::Colour 1.05;
 
 say "# automatically generated by $0";
 use Shiar_Sheet::Colour 1.05;
 
 say "# automatically generated by $0";

diff --git a/tools/mkwordlist b/tools/mkwordlist
index 7611b9f80706813c71ac124a88dafa2a34288c4d..7c71fae606c8233c76b3d64a656c2a43f5d086a2 100755 (executable)
--- a/tools/mkwordlist
+++ b/tools/mkwordlist
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
 #!/usr/bin/env perl
 use 5.014;
 use warnings;

+use open ':std' => ':encoding(utf-8)';
+use lib $0 =~ s{[^/]+$}{..}r; # project root

 
 

-BEGIN { push @INC, '.' }

 use Shiar_Sheet::DB;
 use Shiar_Sheet::DB;

-use open ':std' => ':encoding(utf-8)';

 my $db = Shiar_Sheet::DB->connect;
 
 say 'use utf8;';
 my $db = Shiar_Sheet::DB->connect;
 
 say 'use utf8;';

diff --git a/tools/mkwordthumb b/tools/mkwordthumb
index d79a0029cf7c9359ba194638611aedf33d4eff2c..34c3b6ad8ebd99473d60e0427678297233dba027 100755 (executable)
--- a/tools/mkwordthumb
+++ b/tools/mkwordthumb
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
 #!/usr/bin/env perl
 use 5.014;
 use warnings;

-use lib '.';
+use lib $0 =~ s{[^/]+$}{..}r; # project root

 use Shiar_Sheet::ImagePrep;
 use Shiar_Sheet::DB;
 use JSON ();
 use Shiar_Sheet::ImagePrep;
 use Shiar_Sheet::DB;
 use JSON ();

diff --git a/tools/wordpairs b/tools/wordpairs
index 9ba87f4da9980786768e91e78d29abf297eb703a..8dce28531fc067a6ba203f8be9c91ea2296a979e 100755 (executable)
--- a/tools/wordpairs
+++ b/tools/wordpairs
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
 #!/usr/bin/env perl
 use 5.014;
 use warnings;

-use lib '.';
+use lib $0 =~ s{[^/]+$}{..}r; # project root

 use Shiar_Sheet::DB;
 use Data::Dump 'pp';
 
 use Shiar_Sheet::DB;
 use Data::Dump 'pp';