use relative location and environment variable to find other components at...

use relative location and environment variable to find other components at runtime, avoiding substitution at install time

bin/Makefile.am

-bin_SCRIPTS = access-check-manager.pl update-metadata
+appbindir = $(pkgdatadir)/bin
 
-www_SCRIPTS = access-check-manager.cgi
+appbin_SCRIPTS = app access-check-manager.pl update-metadata
 
-CLEANFILES = $(bin_SCRIPTS) $(www_SCRIPTS)
-
-EXTRA_DIST = access-check-manager.pl.in \
-	     access-check-manager.cgi.in \
-	     update-metadata.in
-
-access-check-manager.pl: Makefile access-check-manager.pl.in
-	sed \
-		-e 's|[@]modulesdir[@]|$(modulesdir)|' \
-		-e 's|[@]confdir[@]|$(confdir)|' \
-		< $(srcdir)/$@.in > $@
-	chmod +x $@
-
-update-metadata: Makefile update-metadata.in
-	sed \
-		-e 's|[@]modulesdir[@]|$(modulesdir)|' \
-		-e 's|[@]confdir[@]|$(confdir)|' \
-		< $(srcdir)/$@.in > $@
-	chmod +x $@
-
-access-check-manager.cgi: Makefile access-check-manager.cgi.in
-	sed \
-		-e 's|[@]modulesdir[@]|$(modulesdir)|' \
-		-e 's|[@]confdir[@]|$(confdir)|' \
-		< $(srcdir)/$@.in > $@
-	chmod +x $@
+EXTRA_DIST = $(appbin_SCRIPTS)

bin/access-check-manager.cgi.in

-#!/usr/bin/perl -T
-
-use strict;
-use warnings;
-use utf8;
-use lib qw(@modulesdir@);
-
-use Config::Tiny;
-use File::Basename;
-
-use AccountManager::App;
-
-my $configuration_file =
-    $ENV{ACCOUNTMANAGER_CONFIG} || '@confdir@/manager.conf';
-my $configuration = Config::Tiny->read($configuration_file, 'utf8');
-if (!$configuration) {
-    die Config::Tiny->errstr() . "\n";
-}
-
-my $configuration_directory = dirname($configuration_file);
-
-my $app = AccountManager::App->new(
-    configuration => $configuration,
-    custom_l10n   => sprintf("%s/l10n", $configuration_directory)
-);
-$app->run();
-
-__END__
-
-=head1 NAME
-
-account-manager-web.pl - Web interface for the Test IdP Account Manager

bin/access-check-manager.pl.in → bin/access-check-manager.pl

@@ -3,14 +3,15 @@
 use strict;
 use warnings;
 use utf8;
-use lib qw(@modulesdir@);
+
+use Mojo::File qw(curfile);
+use lib curfile()->dirname()->sibling('lib')->to_string;
 
 use Config::Tiny;
 use Data::Dumper;
 use DateTime;
 use English qw(-no_match_vars);
 use Getopt::Long qw(:config auto_help);
-use Log::Any::Adapter;
 use Pod::Usage;
 
 use AccountManager::Account;
@@ -43,8 +44,7 @@ pod2usage(
     -verbose => 0
 ) unless $action;
 
-my $configuration_file =
-    $options{configuration} || '@confdir@/manager.conf';
+my $configuration_file = $ENV{MOJO_CONFIG} || 'conf/manager.conf';
 my $configuration = Config::Tiny->read($configuration_file);
 if (!$configuration) {
     die Config::Tiny->errstr() . "\n";

bin/app

+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Mojo::File qw(curfile);
+use lib curfile()->dirname()->sibling('lib')->to_string;
+
+use AccountManager::App;
+
+my $app = AccountManager::App->new(
+    moniker => 'AccessCheck',
+);
+$app->start();

bin/update-metadata.in → bin/update-metadata

@@ -2,7 +2,9 @@
 
 use strict;
 use warnings;
-use lib qw(@modulesdir@);
+
+use Mojo::File qw(curfile);
+use lib curfile()->dirname()->sibling('lib')->to_string;
 
 use Config::Tiny;
 use English qw(-no_match_vars);
@@ -26,8 +28,7 @@ GetOptions(
     -verbose => 0
 );
 
-my $configuration_file =
-    $options{configuration} || '@confdir@/manager.conf';
+my $configuration_file = $ENV{MOJO_CONFIG} || 'conf/manager.conf';
 my $configuration = Config::Tiny->read($configuration_file);
 if (!$configuration) {
     die Config::Tiny->errstr() . "\n";

t/01compile.t

@@ -14,7 +14,7 @@ my $test = Test::Compile->new();
 ok(
     $test->pl_file_compiles($_),
     $_
-) foreach qw(bin/access-check-manager.cgi bin/access-check-manager.pl);
+) foreach qw(bin/app bin/update-metadata bin/access-check-manager.pl);
 ok(
     $test->pm_file_compiles($_),
     $_