From 57060f5254e48a9eead04426803d4f102f2b0a4b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 9 Jan 2018 23:34:24 +0000
Subject: Miscellaneous code cleanup.

---
 lib/MGA/DrakISO/BuildISO.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/MGA/DrakISO/BuildISO.pm')

diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm
index 41f562a..b3ca5d2 100644
--- a/lib/MGA/DrakISO/BuildISO.pm
+++ b/lib/MGA/DrakISO/BuildISO.pm
@@ -46,14 +46,14 @@ our @EXPORT = qw(build_iso);
 sub build_iso {
     my ($build) = @_;
 
-    my $loopbacks = $build->get_builddir('loopbacks');
-    my $files     = $build->get_builddir('files');
+    my $loopbacks = $build->get_build_dir('loopbacks');
+    my $files     = $build->get_build_dir('files');
 
     build_iso_image(
         $build,
-        '/boot=' . $build->get_builddir('boot'),
+        '/boot=' . $build->get_build_dir('boot'),
         if_($build->{settings}{arch} eq 'x86_64',
-            '/EFI=' . $build->get_builddir('EFI'),
+            '/EFI=' . $build->get_build_dir('EFI'),
         ),
         if_(-d $loopbacks,
             map {
@@ -102,10 +102,10 @@ sub build_iso_image {
     my $mbr_image = $build->get_absolute_path($build->{media}{mbr_boot_img}) // '/usr/lib/grub/i386-pc/boot_hybrid.img';
     -e $mbr_image or die "ERROR: cannot find MBR boot image $mbr_image\n";
 
-    my $esp_image = $build->get_builddir('images') . '/esp.img';
+    my $esp_image = $build->get_build_dir('images') . '/esp.img';
     -e $esp_image || $arch ne 'x86_64' or die "ERROR: cannot find ESP image $esp_image\n";
 
-    my $build_dir = $build->get_builddir('dist');
+    my $build_dir = $build->get_build_dir('dist');
     mkdir_p($build_dir);
 
     my $dest = $build_dir . '/' . $build->get_name . '.iso';
-- 
cgit v1.2.1