Changeset 29546 for main/trunk/package-kits/linux/perllib

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.

Location:

main/trunk/package-kits/linux/perllib/Greenstone

Files:

• Config.pm (modified) (2 diffs)
• Config/Loader.pm (deleted)
• Package.pm (modified) (3 diffs)
• Package/_apt.pm (modified) (1 diff)
• Package/_pacman.pm (modified) (1 diff)
• Package/_rpm.pm (modified) (1 diff)

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

@@ -4 +4 @@
 use warnings;
 use utf8; 
+use Greenstone::Helpers;
 
 # Formats an array
@@ -31 +32 @@
 }
 
+# Reads a config file into the config hashmap
+sub readconf {
+    my ($self, $conf) = @_;
+    $self->{config} = {} unless exists $self->{config};
+    open CONF, '<', $conf
+        or die "Failed to open '$conf' for reading: $!";
+    my $var;
+    while (my $line = <CONF>) {
+        if (empty $line or comment $line) {
+            $var = undef;
+        } elsif (defined $var and $line =~ /^\s/) {
+            trim $line;
+            $self->subst ($line);
+            escape $line;
+            push @{$self->{config}->{$var}}, $line;
+        } else {
+            ($var, my $val) = trim (split ":", $line, 2);
+            defined $var and defined $val or die "Invalid variable assignment: '$line'";
+            if (empty $val) {
+                $self->{config}->{$var} = [];
+            } else {
+                $self->subst ($val);
+                escape $val;
+                $self->{config}->{$var} = $val;
+            }
+        }
+    }
+    close CONF;
+}
+
 1;

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;
 }

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

@@ -12 +12 @@
 }
 
+sub write_function {
+    my ($self, $name, @lines) = @_;
+    open OUT, '>', "/tmp/$name";
+    for my $line (@lines) {
+        print OUT $line, "\n";
+    }
+    close OUT;
+    $self->add ("/tmp/$name", "$self->{output}/$name");
+}
+
+sub add_install {
+    my $self = shift;
+    exists $self->{config}->{PRE_INSTALL} and
+        $self->write_function ("preinst", @{$self->{config}->{PRE_INSTALL}});
+    exists $self->{config}->{POST_INSTALL} and
+        $self->write_function ("postinst", @{$self->{config}->{POST_INSTALL}});
+    exists $self->{config}->{PRE_REMOVE} and
+        $self->write_function ("prerm", @{$self->{config}->{PRE_REMOVE}});
+    exists $self->{config}->{POST_REMOVE} and
+        $self->write_function ("postrm", @{$self->{config}->{POST_REMOVE}});
+}
+
 1;

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

@@ -38 +38 @@
 }
 
+sub write_function {
+    my ($name, $out, @lines) = @_;
+    print $out $name, "() {\n";
+    for my $line (@lines) {
+        print $out "\t", $line, "\n";
+    }
+    print $out "}\n\n";
+}
+
+sub add_install {
+    my $self = shift;
+    if (exists $self->{config}->{PRE_INSTALL} or
+        exists $self->{config}->{POST_INSTALL} or
+        exists $self->{config}->{PRE_REMOVE} or
+        exists $self->{config}->{POST_REMOVE}) {
+        my $name = "$self->{config}->{NAME}.install";
+        open my $INSTALL, '>', "/tmp/$name";
+        exists $self->{config}->{PRE_INSTALL} and do {
+            write_function "pre_install", $INSTALL, @{$self->{config}->{PRE_INSTALL}};
+            write_function "pre_upgrade", $INSTALL, @{$self->{config}->{PRE_INSTALL}};
+        };
+        exists $self->{config}->{POST_INSTALL} and do {
+            write_function "post_install", $INSTALL, @{$self->{config}->{POST_INSTALL}};
+            write_function "post_upgrade", $INSTALL, @{$self->{config}->{POST_INSTALL}};
+        };
+        exists $self->{config}->{PRE_REMOVE} and
+            write_function "pre_remove", $INSTALL, @{$self->{config}->{PRE_REMOVE}};
+        exists $self->{config}->{POST_REMOVE} and
+            write_function "post_remove", $INSTALL, @{$self->{config}->{POST_REMOVE}};
+        close $INSTALL;
+        $self->add ("/tmp/$name", "$self->{output}/$name");
+        $self->{config}->{INSTALL} = "install=$name";
+    } else {
+        $self->{config}->{INSTALL} = "";
+    }
+}
+
 1;

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

@@ -12 +12 @@
 }
 
+sub write_function {
+    my ($name, @lines) = @_;
+    my $ret = "";
+    $ret .= "%" . $name . "\n";
+    for my $line (@lines) {
+        $ret .= $line . "\n";
+    }
+    $ret .= "\n";
+    return $ret;
+}
+
+sub add_install {
+    my $self = shift;
+    $self->{config}->{INSTALL} = "";
+    exists $self->{config}->{PRE_INSTALL} and
+        $self->{config}->{INSTALL} .= write_function "pre", @{$self->{config}->{PRE_INSTALL}};
+    exists $self->{config}->{POST_INSTALL} and
+        $self->{config}->{INSTALL} .= write_function "post", @{$self->{config}->{POST_INSTALL}};
+    exists $self->{config}->{PRE_REMOVE} and
+        $self->{config}->{INSTALL} .= write_function "preun", @{$self->{config}->{PRE_INSTALL}};
+    exists $self->{config}->{POST_REMOVE} and
+        $self->{config}->{INSTALL} .= write_function "postun", @{$self->{config}->{POST_INSTALL}};
+}
+
 1;