summaryrefslogtreecommitdiffstats
path: root/rescue/make_rescue_img
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-09 04:42:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-09 04:42:50 +0000
commitd55618ebe3f2bfb368c8d127f1e83789d82f634c (patch)
treef94233baee37bec4a912bb5b8e34a6f4e5fc0364 /rescue/make_rescue_img
parent0344a3b5e4c6b9a261c1c0a17f3cb6f647364b23 (diff)
downloaddrakx-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar
drakx-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar.gz
drakx-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar.bz2
drakx-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar.xz
drakx-d55618ebe3f2bfb368c8d127f1e83789d82f634c.zip
use "*" instead of PERL_VERSION in list, but ensure only one match
Diffstat (limited to 'rescue/make_rescue_img')
-rwxr-xr-xrescue/make_rescue_img14
1 files changed, 10 insertions, 4 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 8afbb4d4e..9c7352338 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -74,10 +74,16 @@ foreach (keyboard::loadkeys_files()) {
}
my $perl_version = join ".", unpack "C3", $^V;
-@files = map { chomp; s/PERL_VERSION/$perl_version/g; s|/LIB/|/$lib/|g; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
-@files = `ls -d @files`;
-$? == 0 or exit 1;
-
+my @bad;
+@files = map {
+ chomp;
+ s/PERL_VERSION/$perl_version/g;
+ s|/LIB/|/$lib/|g;
+ my @l = glob($_) or push @bad, $_;
+ m|\*.*/| && @l != 1 and die "multiple match for $_\n";
+ @l;
+} (cat_("list"), cat_(`../tools/specific_arch list`));
+@bad and die "files missing\n" . join("\n", @bad) . "\n";
install_l(@files);
foreach (cat_("aliases")) {