diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-24 12:17:14 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-24 12:21:07 +0000 |
| commit | fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638 (patch) | |
| tree | 5d937eaa2ab5d9668f35eb0269714598d283a9c2 /lib/MGA | |
| parent | f537f6c4bcb2aae6731a005cb249bd3373804066 (diff) | |
| download | drakiso-fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638.tar drakiso-fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638.tar.gz drakiso-fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638.tar.bz2 drakiso-fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638.tar.xz drakiso-fcfc33ede09d3ad323c1ad4bf4c8e4a3c118c638.zip | |
Minor cleanup of code that gets build dirs.
Diffstat (limited to 'lib/MGA')
| -rw-r--r-- | lib/MGA/DrakISO/BuildBoot.pm | 2 | ||||
| -rw-r--r-- | lib/MGA/DrakISO/BuildMedia.pm | 6 | ||||
| -rw-r--r-- | lib/MGA/DrakISO/Config.pm | 2 |
3 files changed, 5 insertions, 5 deletions
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 { |