Switch to Config::Parser 1.03

* Makefile.PL: Require Config::Parser 1.03
* lib/SlackBuilder.pm: Update direct addressing syntax

2 files changed, 11 insertions, 11 deletions

diff --git a/Makefile.PL b/Makefile.PL
index ffe3c6a..05bbd84 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,7 +27,7 @@ WriteMakefile(NAME => 'slackbuilder',
 	      EXE_FILES    => [ 'slackbuilder' ],
 	      PREREQ_PM    => {
 		  'Archive::Tar' => 2.28,
-                  'Config::Parser::Ini' => 0,
+                  'Config::Parser' => 1.03,
 		  'File::Basename' => 0,
 		  'File::Copy' => 0,
 		  'File::Path' => 0,
diff --git a/lib/SlackBuilder.pm b/lib/SlackBuilder.pm
index 3423ff9..70e25b7 100644
--- a/lib/SlackBuilder.pm
+++ b/lib/SlackBuilder.pm
@@ -65,7 +65,7 @@ sub new {
 	     my $pfx = "$0: $priority";
 	     if ($priority eq 'DEBUG') {
 		 $pfx .= ": $category";
-		 if ($self->conf->tree->Core->Verbose->value > 1) {
+		 if ($self->conf->core->verbose > 1) {
 		     my $caller_offset = Log::Log4perl::caller_depth_offset($caller_level);
 		     my ($package,$filename,$line) = caller($caller_offset);
 		     $pfx .= ": $filename:$line";
@@ -80,14 +80,14 @@ sub new {
     $appender->layout($layout);
     $self->logger->add_appender($appender);
     my $v;
-    if (defined($v = $self->conf->tree->Core->Logging->value) && -f $v) {
+    if (defined($v = $self->conf->core->logging) && -f $v) {
 	Log::Log4perl::init($v);
     }
     
     if ($v = delete $args{verbose}) {
 	$self->conf->set(qw(core verbose), $v);
     }
-    if ($self->conf->tree->Core->Verbose->value) {
+    if ($self->conf->core->verbose > 0) {
 	$self->logger->level($DEBUG);
     }
 
@@ -104,16 +104,16 @@ sub new {
 
 sub conf { shift->{conf} }
 
-sub rootdir  { shift->conf->tree->Dir->Root->value };
-sub spooldir { shift->conf->tree->Dir->Spool->value };
-sub tmpdir   { shift->conf->tree->Dir->Tmp->value };
-sub logdir   { shift->conf->tree->Dir->Log->value };
-sub pkgdir   { shift->conf->tree->Dir->Pkg->value };
+sub rootdir  { shift->conf->dir->root->value };
+sub spooldir { shift->conf->dir->spool->value };
+sub tmpdir   { shift->conf->dir->tmp->value };
+sub logdir   { shift->conf->dir->log->value };
+sub pkgdir   { shift->conf->dir->pkg->value };
 sub ospkgdir {
     my $self = shift;
     File::Spec->catfile($self->pkgdir, $self->osversion, @_);
 }
-sub image    { shift->conf->tree->Core->Image->value };
+sub image    { shift->conf->core->image->value };
 sub arch     { shift->{_arch} };
 
 sub logger { shift->{_logger} //= Log::Log4perl::get_logger('SlackBuild') }
@@ -177,7 +177,7 @@ sub file {
     my ($self, $name) = @_;
     my $src = File::Spec->catfile($self->tmpdir, $name);
 
-    if (my $tag = $self->conf->tree->Core->Tag->value) {
+    if (my $tag = $self->conf->core->tag->value) {
 	my ($base,$path) = fileparse($name);
 	my $r = SlackBuild::Registry::Record->split($base);
 	$r->tag($tag);