diff options
Diffstat (limited to 'dselect/methods/multicd/install')
| -rwxr-xr-x | dselect/methods/multicd/install | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install index 99bbf15c1..054d4eac1 100755 --- a/dselect/methods/multicd/install +++ b/dselect/methods/multicd/install @@ -118,10 +118,11 @@ do @filename= split(/ /,$_) if s/^Filename: //i; @msdosfilename= split(/ /,$_) if s/^MSDOS-Filename: //i; } - length($package) || die "internal error - no package"; - @filename || die "internal error - no filename"; - @filename==@msdosfilename || !@filename || !@msdosfilename || - die "internal error - mismatch >@filename< >@msdosfilename<"; + die "internal error - no package" if length($package) == 0; + die "internal error - no filename" if not @filename; + die "internal error - mismatch >@filename< >@msdosfilename<" + if @filename && @msdosfilename && + @filename != @msdosfilename; if ($medium && ($medium ne $thisdisk)) { print " @@ -147,8 +148,10 @@ Please change the discs and press <RETURN>. } else { $base= $filename[$i]; $base =~ s,.*/,,; $msdosbase= $msdosfilename[$i]; $msdosbase =~ s,.*/,,; - defined($c= open(X,"-|")) || + $c = open(X, "-|")); + if (not defined $c) { die "failed to fork for find: $!\n"; + } if (!$c) { exec("find", "-L", length($binaryprefix) ? $binaryprefix : ".", |