Changeset 29546 for main/trunk/package-kits/linux/perllib/Greenstone/Package.pm

Timestamp:

2014-12-08T12:19:58+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Arch package now automatically sets the owner of the web directory to the tomcat user. The functionality is also implemented for the other package managers, but not yet tested.

File:

• main/trunk/package-kits/linux/perllib/Greenstone/Package.pm (modified) (3 diffs)

main/trunk/package-kits/linux/perllib/Greenstone/Package.pm

@@ -8 +8 @@
 use Greenstone::Helpers;
 use base 'Exporter';
-require Greenstone::Config::Loader;
 
 use parent 'Greenstone::Config';
@@ -53 +52 @@
 
     # Classify ourselves as config and load the config
-    my $self = bless({}, 'Greenstone::Config::Loader');
+    my $self = bless({}, 'Greenstone::Config');
 
     $self->readconf ("global.conf");
     $self->readconf ($distro_conf);
-    $self->readconf ($package_conf);
-
+    
     die "Distro '$args{distro}' is invalid (does not specify a manager)"
         unless (exists $self->{config}->{MANAGER});
 
     my $class = __PACKAGE__ . '::_' . lc $self->{config}->{MANAGER};
-    eval "require $class; 1" or die "Package manager '$self->{config}->{MANAGER}' does not exist";
+    eval "require $class; 1" or die "Package manager '$self->{config}->{MANAGER}' does not exist or did not compile";
 
     # Reclassify as our implementation
     bless $self, $class;
+
+    $self->readconf ($package_conf);
 
     $self->{package} = $args{package};
@@ -75 +75 @@
     $self->add_sources;
     $self->add_makefile;
+    $self->add_install;
     $self->add_package;
 }