From fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 24 Dec 2017 12:17:14 +0000
Subject: Minor cleanup of code that gets build dirs.

---
 lib/MGA/DrakISO/BuildBoot.pm  | 2 +-
 lib/MGA/DrakISO/BuildMedia.pm | 6 +++---
 lib/MGA/DrakISO/Config.pm     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm
index df29f8a..b88561f 100644
--- a/lib/MGA/DrakISO/BuildBoot.pm
+++ b/lib/MGA/DrakISO/BuildBoot.pm
@@ -85,7 +85,7 @@ sub prepare_iso_bootloader {
     }
 
     # Create a subdirectory to hold the grub2 bootloader.
-    my $grub2_dir = $build->get_builddir('boot') . '/grub2';
+    my $grub2_dir = $build->get_builddir('boot/grub2');
     mkdir_p($grub2_dir);
 
     # Locate and copy the default font for the bootloader. If we can't find a
diff --git a/lib/MGA/DrakISO/BuildMedia.pm b/lib/MGA/DrakISO/BuildMedia.pm
index da278c9..32dc1ee 100644
--- a/lib/MGA/DrakISO/BuildMedia.pm
+++ b/lib/MGA/DrakISO/BuildMedia.pm
@@ -95,7 +95,7 @@ sub prepare_media {
     my $version = $build->{settings}{version};
     my $tag     = $build->{settings}{tag};
 
-    my $arch_dir = $build->get_builddir('files') . '/' . $arch;
+    my $arch_dir = $build->get_builddir('files/' . $arch);
 
     create_product_id($build, $arch_dir . '/product.id');
     create_index($build, $arch_dir . '/pkg-' . $version . '-' . $tag . '.idx');
@@ -470,7 +470,7 @@ sub build_installer_media {
 
     # Create a clean set of media directories
     my $arch = $build->{settings}{arch};
-    my $arch_dir = $build->get_builddir('files') . '/' . $arch;
+    my $arch_dir = $build->get_builddir('files/' . $arch);
     my $media_dir = $arch_dir . '/media/';
     rm_rf($media_dir) if -e $media_dir;
     mkdir_p($media_dir . 'media_info');
@@ -577,7 +577,7 @@ sub create_index {
 
     my $arch = $build->{settings}{arch};
 
-    my $media_dir = $build->get_builddir($arch . '/media/');
+    my $media_dir = $build->get_builddir('files/' . $arch . '/media/');
     my @hdlists = glob("$media_dir/*/media_info/hdlist.cz");
 
     my @tab;
diff --git a/lib/MGA/DrakISO/Config.pm b/lib/MGA/DrakISO/Config.pm
index a9a2566..c987bdf 100644
--- a/lib/MGA/DrakISO/Config.pm
+++ b/lib/MGA/DrakISO/Config.pm
@@ -84,7 +84,7 @@ sub complete_config {
 
     mkdir_p($build->get_builddir);
     mkdir_p($build->get_system_root);
-    $build->{mnt} ||= $build->get_builddir . "/mnt";
+    $build->{mnt} ||= $build->get_builddir('/mnt');
 }
 
 sub dump_config {
-- 
cgit v1.2.1