diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-10 09:03:20 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-12 08:44:42 +0000 |
| commit | ff30da3ebb107421372e2a1a6d37f7c189667f2b (patch) | |
| tree | 7dcb10f555e74768f55029d644d16e636abb5420 /lib/MGA/DrakISO/BuildISO.pm | |
| parent | 98ac027245772b49c24b1bbe35b0f33e6551c3e8 (diff) | |
| download | drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar.gz drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar.bz2 drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.tar.xz drakiso-ff30da3ebb107421372e2a1a6d37f7c189667f2b.zip | |
Simplify run_() helper function and minimise direct calls to system().
Diffstat (limited to 'lib/MGA/DrakISO/BuildISO.pm')
| -rw-r--r-- | lib/MGA/DrakISO/BuildISO.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm index b3ca5d2..8e90c55 100644 --- a/lib/MGA/DrakISO/BuildISO.pm +++ b/lib/MGA/DrakISO/BuildISO.pm @@ -114,7 +114,7 @@ sub build_iso_image { chomp($xorriso_version); my $date_file = $build_dir . '/DATE.txt'; - run_('date', '>', $date_file); + run_("date > $date_file"); run_('xorrisofs', if_($::verbose < 2, '-quiet'), @@ -149,11 +149,10 @@ sub build_iso_image { '/DATE.txt=' . $date_file, ) or die "ERROR: unable to run xorrisofs\n"; - my $filename = basename($dest); - run_('mgaiso-addmd5', '>', '/dev/null', '2>', '/dev/null', $dest); - run_({ chdir => $build_dir }, 'md5sum', '>', $dest . '.md5', $filename); - run_({ chdir => $build_dir }, 'sha1sum', '>', $dest . '.sha1', $filename); - run_({ chdir => $build_dir }, 'sha512sum', '>', $dest . '.sha512', $filename); + run_("mgaiso-addmd5 $dest > /dev/null 2> /dev/null"); + run_("md5sum $dest > $dest.md5"); + run_("sha1sum $dest > $dest.sha1"); + run_("sha512sum $dest > $dest.sha512"); if (my $suffix = $build->get_set_suffix) { if (my ($prefix, $ext) = $dest =~ /(.*)(\.[^.]+)$/) { my $link = $prefix . $suffix . $ext; |