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.

---
 draklive | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'draklive')

diff --git a/draklive b/draklive
index 6d2b675..63ff7f4 100755
--- a/draklive
+++ b/draklive
@@ -51,9 +51,9 @@ $::verbose = 1;
 sub clean {
     my ($build) = @_;
 
-    if (-e $build->get_builddir) {
-        umount_all_in_root($build->get_builddir);
-        system('sudo rm -rf ' . $build->get_builddir);
+    if (-e $build->get_build_dir) {
+        umount_all_in_root($build->get_build_dir);
+        system('sudo rm -rf ' . $build->get_build_dir);
     }
     if (-e $build->get_chroot_dir) {
         umount_all_in_root($build->get_chroot_dir);
@@ -63,14 +63,14 @@ sub clean {
 
 sub prepare_root {
     my ($build) = @_;
-    MGA::DrakISO::BuildRoot::install_live_system($build);
-    MGA::DrakISO::BuildRoot::customise_live_system($build);
+    install_live_system($build);
+    customise_live_system($build);
 }
 
 sub prepare_boot {
     my ($build) = @_;
-    MGA::DrakISO::BuildBoot::prepare_live_system_boot($build);
-    MGA::DrakISO::BuildBoot::prepare_iso_bootloader($build);
+    prepare_live_system_boot($build);
+    prepare_iso_bootloader($build);
 }
 
 ###############################################################################
@@ -81,13 +81,13 @@ my @actions = (
     { name => 'dump-config',    do => \&MGA::DrakISO::Config::dump_config },
     { name => 'clean',          do => \&clean },
     { name => 'root',           do => \&prepare_root },
-    { name => 'root-install',   do => \&MGA::DrakISO::BuildRoot::install_live_system },
-    { name => 'root-customise', do => \&MGA::DrakISO::BuildRoot::customise_live_system },
+    { name => 'root-install',   do => \&install_live_system },
+    { name => 'root-customise', do => \&customise_live_system },
     { name => 'boot',           do => \&prepare_boot },
-    { name => 'boot-system',    do => \&MGA::DrakISO::BuildBoot::prepare_live_system_boot },
-    { name => 'boot-loader',    do => \&MGA::DrakISO::BuildBoot::prepare_iso_bootloader },
-    { name => 'loop',           do => \&MGA::DrakISO::BuildLoop::build_live_loopback_files },
-    { name => 'master',         do => \&MGA::DrakISO::BuildISO::build_iso },
+    { name => 'boot-system',    do => \&prepare_live_system_boot },
+    { name => 'boot-loader',    do => \&prepare_iso_bootloader },
+    { name => 'loop',           do => \&build_live_loopback_files },
+    { name => 'master',         do => \&build_iso },
 );
 my @all = qw(root boot loop master);
 
-- 
cgit v1.2.1