diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-12-13 15:56:00 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-12-13 15:56:00 +0000 |
commit | 4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25 (patch) | |
tree | a12104a3a9468cc42b83634feb5e6a2e72003532 /perl-install/commands.pm | |
parent | f298cec9f7d4bb4dc1972cc737007b6da86d4cb0 (diff) | |
download | drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.gz drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.bz2 drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.tar.xz drakx-4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25.zip |
better english (writing style rather than spoken one)
Diffstat (limited to 'perl-install/commands.pm')
-rw-r--r-- | perl-install/commands.pm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm index fe6ad8dba..dd7bc1ab5 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -38,7 +38,7 @@ sub false() { exit 1 } sub cat { @ARGV = @_; print while <> } sub dirname_ { print dirname(@_), "\n" } sub basename_ { print basename(@_), "\n" } -sub rmdir_ { foreach (@_) { rmdir $_ or die "rmdir: can't remove $_\n" } } +sub rmdir_ { foreach (@_) { rmdir $_ or die "rmdir: can not remove $_\n" } } sub lsmod() { print "Module Size Used by\n"; cat("/proc/modules") } sub which { ARG: foreach (@_) { foreach my $c (split /:/, $ENV{PATH}) { -x "$c/$_" and print("$c/$_\n"), next ARG } } @@ -124,7 +124,7 @@ sub rm { if (!-l $_ && -d $_) { $rec or die "$_ is a directory\n"; &$rm(glob_($_)); - rmdir $_ or die "can't remove directory $_: $!\n"; + rmdir $_ or die "can not remove directory $_: $!\n"; } else { unlink $_ or die "rm of $_ failed: $!\n" } } }; @@ -202,7 +202,7 @@ sub ls { @_ == 1 && -d $_[0] and @_ = glob_($_[0]); foreach (sort @_) { if ($l) { - my @s = lstat or warn("can't stat file $_\n"), next; + my @s = lstat or warn("can not stat file $_\n"), next; formline( "@<<<<<<<<< @<<<<<<< @<<<<<<< @>>>>>>>> @>>>>>>>>>>>>>>> @*\n", rights($s[2]), getpwuid $s[4] || $s[4], getgrgid $s[5] || $s[5], @@ -256,15 +256,15 @@ sub dd { $h{$1} = $2; } local (*IF, *OF); my ($tmp, $nb, $read); - ref($h{if}) eq 'GLOB' ? (*IF = $h{if}) : sysopen(IF, $h{if}, 0) || die "error: can't open file $h{if}\n"; - ref($h{of}) eq 'GLOB' ? (*OF = $h{of}) : sysopen(OF, $h{of}, 0x41) || die "error: can't open file $h{of}\n"; + ref($h{if}) eq 'GLOB' ? (*IF = $h{if}) : sysopen(IF, $h{if}, 0) || die "error: can not open file $h{if}\n"; + ref($h{of}) eq 'GLOB' ? (*OF = $h{of}) : sysopen(OF, $h{of}, 0x41) || die "error: can not open file $h{of}\n"; $h{bs} = removeXiBSuffix($h{bs}); for ($nb = 0; !$h{count} || $nb < $h{count}; $nb++) { printf "\r%02.1d%%", 100 * $nb / $h{count} if $h{count} && $percent; - $read = sysread(IF, $tmp, $h{bs}) or ($h{count} ? die "error: can't read block $nb\n" : last); - syswrite(OF, $tmp) or die "error: can't write block $nb\n"; + $read = sysread(IF, $tmp, $h{bs}) or ($h{count} ? die "error: can not read block $nb\n" : last); + syswrite(OF, $tmp) or die "error: can not write block $nb\n"; $read < $h{bs} and $read = 1, last; } print STDERR "\r$nb+$read records in\n"; @@ -275,7 +275,7 @@ sub head_tail { my ($h, $n) = getopts(\@_, qw(hn)); $h || @_ < to_bool($n) and die "usage: $0 [-h] [-n lines] [<file>]\n"; $n = $n ? shift : 10; - my $fh; @_ ? open($fh, $_[0]) || die "error: can't open file $_[0]\n" : ($fh = *STDIN); + my $fh; @_ ? open($fh, $_[0]) || die "error: can not open file $_[0]\n" : ($fh = *STDIN); if ($0 eq 'head') { local $_; @@ -320,7 +320,7 @@ sub more { require devices; my $tty = devices::make('tty'); my $n = 0; - open(my $IN, $tty) or die "can't open $tty\n"; + open(my $IN, $tty) or die "can not open $tty\n"; local $_; while (<>) { if (++$n == 25) { @@ -346,7 +346,7 @@ sub insmod { ($f) = modules::extract_modules('/tmp', $name); } if (! -r $f) { - die "can't find module $f\n"; + die "can not find module $f\n"; } run_program::run(["/usr/bin/insmod_", "insmod"], "-f", $f, @_) or die("insmod $f failed"); unlink $f; @@ -434,7 +434,7 @@ sub dmesg() { print cat_("/tmp/syslog") } sub sort { my ($n, $h) = getopts(\@_, qw(nh)); $h and die "usage: sort [-n] [<file>]\n"; - my $fh; @_ ? open($fh, $_[0]) || die "error: can't open file $_[0]\n" : ($fh = *STDIN); + my $fh; @_ ? open($fh, $_[0]) || die "error: can not open file $_[0]\n" : ($fh = *STDIN); if ($n) { print(sort { $a <=> $b } <$fh>); } else { |