1

Use Cwd::utf8 to cope with returning string ut8-ness

* Use Cwd::utf8
* Sort cpanfile require, remove duplicates, add Cwd::utf8
* Add check on first call of abs_path()
This commit is contained in:
eleksir
2020-09-19 14:48:29 +03:00
parent 9461042ec4
commit d53ee53ad8
2 changed files with 14 additions and 6 deletions

View File

@@ -18,6 +18,8 @@ BEGIN {
} }
use lib ("$workdir/lib", "$workdir/vendor_perl", "$workdir/vendor_perl/lib/perl5"); use lib ("$workdir/lib", "$workdir/vendor_perl", "$workdir/vendor_perl/lib/perl5");
no Cwd;
use Cwd::utf8 qw(chdir abs_path);
use POSIX qw(setgid setuid setsid); use POSIX qw(setgid setuid setsid);
use File::Path qw(make_path); use File::Path qw(make_path);
use File::Basename qw(basename dirname); use File::Basename qw(basename dirname);
@@ -70,8 +72,13 @@ if ($< == 0) {
# double fork attach to /dev/null all stdio and go background # double fork attach to /dev/null all stdio and go background
daemonize (); daemonize ();
unless (defined($apath)) {
logger ("Unable to get abs_path: $!");
die "Unable to get abs_path: $!\n";
};
# write pidfile # write pidfile
my $pidfile = sprintf ("%s/%s.pid", $piddir, basename (abs_path ($0))); my $pidfile = sprintf ("%s/%s.pid", $piddir, basename ($apath));
logger ("Creating pidfile at $pidfile"); logger ("Creating pidfile at $pidfile");
open (PID, ">", $pidfile) or die "Error opening $pidfile: $!\n"; open (PID, ">", $pidfile) or die "Error opening $pidfile: $!\n";
print PID $$ or die "Error writing to $pidfile: $!\n"; print PID $$ or die "Error writing to $pidfile: $!\n";

View File

@@ -1,14 +1,15 @@
requires 'local::lib'; requires 'Cwd::utf8';
requires 'JSON';
requires 'Hailo';
requires 'Telegram::Bot';
requires 'DB_File'; requires 'DB_File';
requires 'Digest::MD5'; requires 'Digest::MD5';
requires 'Encode'; requires 'Encode';
requires 'File::Path';
requires 'File::Basename'; requires 'File::Basename';
requires 'File::Path';
requires 'HTTP::Tiny'; requires 'HTTP::Tiny';
requires 'Hailo'; requires 'Hailo';
requires 'JSON';
requires 'JSON::XS'; requires 'JSON::XS';
requires 'JSON::PP';
requires 'Mojo::Base'; requires 'Mojo::Base';
requires 'Telegram::Bot';
requires 'URI::URL'; requires 'URI::URL';
requires 'local::lib';