summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-08-26 11:13:14 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-08-26 11:13:14 (GMT)
commitadf16c29939378f3eaa716239da53bb7e3ef6283 (patch) (side-by-side diff)
tree5aabf2387a5ece4baf01a6f420a5b03b0f4eb72a
parentd9d63339f7df96d7dfcdbd11edbe996359b5813e (diff)
downloadacmeman-adf16c29939378f3eaa716239da53bb7e3ef6283.tar.gz
acmeman-adf16c29939378f3eaa716239da53bb7e3ef6283.tar.bz2
Don't distribute a copy of AutoInstall.pmv2.00
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.PL11
-rw-r--r--bootstrap.pl61
2 files changed, 6 insertions, 66 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 43555f8..0d093a8 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,13 +1,12 @@
# -*- perl -*-
use strict;
-use lib 'inc';
use Module::Metadata;
use Getopt::Long qw(:config gnu_getopt no_ignore_case pass_through);
use ExtUtils::MakeMaker;
my %makefile_args = (
NAME => 'App::Acmeman',
- ABSTRACT_FROM => 'acmeman',
+ ABSTRACT => 'manages ACME certificates',
VERSION_FROM => 'lib/App/Acmeman.pm',
AUTHOR => 'Sergey Poznyakoff <gray@gnu.org>',
LICENSE => 'gpl_3',
@@ -54,9 +53,11 @@ my %makefile_args = (
my $no_autoinstall;
GetOptions('no-autoinstall|N' => \$no_autoinstall) or exit(1);
unless ($no_autoinstall) {
- require ExtUtils::AutoInstall;
- ExtUtils::AutoInstall->import(-core => $makefile_args{PREREQ_PM});
- delete $makefile_args{PREREQ_PM};
+ eval {
+ require ExtUtils::AutoInstall;
+ ExtUtils::AutoInstall->import(-core => $makefile_args{PREREQ_PM});
+ delete $makefile_args{PREREQ_PM};
+ };
}
WriteMakefile(%makefile_args);
diff --git a/bootstrap.pl b/bootstrap.pl
deleted file mode 100644
index 90db16a..0000000
--- a/bootstrap.pl
+++ b/dev/null
@@ -1,61 +0,0 @@
-#! /usr/bin/perl
-# This file is part of acmeman.
-# Copyright (C) 2014, 2017 Sergey Poznyakoff <gray@gnu.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-use strict;
-use CPAN;
-use Cwd qw(getcwd);
-use File::Path qw(mkpath);
-
-####
-my $incdir = "inc/ExtUtils";
-my $topdir = getcwd;
-
-my $modname = "ExtUtils::AutoInstall";
-
-my $mod = CPAN::Shell->expandany($modname) or die "Can't expand $modname";
-my $file = $mod->inst_file;
-my $dir;
-
-if (defined($file)) {
- print "$modname installed at $file\n";
- if (-f $file) {
- $file =~ s#/[^/]+\.pm$##;
- if (-d $file) {
- $dir = $file;
- } else {
- die "Can't find $modname directory";
- }
- }
-} else {
- print "Getting $modname\n";
- my $distro = $mod->get or die "Can't get distribution for $modname";
- $dir = $distro->dir;
-}
-
-$file = "$dir/$incdir/AutoInstall.pm";
-$file = "$dir/AutoInstall.pm" unless (-f $file);
--f $file or die "$file not found";
-
-use autodie;
-chdir $topdir;
-mkpath $incdir unless -d $incdir;
-chdir $incdir;
-no autodie;
-unlink "AutoInstall.pm";
-use autodie;
-symlink $file, "AutoInstall.pm";
-

Return to:

Send suggestions and report system problems to the System administrator.