ward/publicscripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

line numbers with every die()

Browse source
This commit is contained in:
Ward Wouts 2004-01-25 15:14:20 +00:00
parent bc81ab8dc7
commit 7c72b0ac88
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mycp/mycp
View file

@ -107,9 +107,9 @@ sub cmdline {
sub readconfig { sub readconfig {
if ( -f "$ENV{HOME}/.mycprc" && -r "$ENV{HOME}/.mycprc" ) { if ( -f "$ENV{HOME}/.mycprc" && -r "$ENV{HOME}/.mycprc" ) {
do "$ENV{HOME}/.mycprc" or die "Couldn't parse $ENV{HOME}/.mycprc\n"; do "$ENV{HOME}/.mycprc" or die "Couldn't parse $ENV{HOME}/.mycprc";
} elsif ( -f "/etc/mycp" && -r "/etc/mycp" ) { } elsif ( -f "/etc/mycp" && -r "/etc/mycp" ) {
do "/etc/mycp" or die "Couldn't parse /etc/mycp\n"; do "/etc/mycp" or die "Couldn't parse /etc/mycp";
} }
} }
@ -135,7 +135,7 @@ sub backup($) {
print "Creating \"$dir/OLD\" directory\n"; print "Creating \"$dir/OLD\" directory\n";
unless ( -d "$dir/OLD" ) { unless ( -d "$dir/OLD" ) {
if ( -w $dir ) { if ( -w $dir ) {
mkdir "$dir/OLD", 0777 or die "Couldn't create $dir/OLD: $!\n"; mkdir "$dir/OLD", 0777 or die "Couldn't create $dir/OLD: $!";
} else { } else {
system("$sudocmd mkdir " . &escape("$dir/OLD")); system("$sudocmd mkdir " . &escape("$dir/OLD"));
} }
@ -151,13 +151,13 @@ sub backup($) {
} }
if ( -w $file || -w &fullpath($file) ) { if ( -w $file || -w &fullpath($file) ) {
copy("$file", "$backup") or die "Couldn't copy $file to $backup: $!\n"; copy("$file", "$backup") or die "Couldn't copy $file to $backup: $!";
} else { } else {
system("$sudocmd $cpcmd " . &escape($file) . " " . &escape($backup)); system("$sudocmd $cpcmd " . &escape($file) . " " . &escape($backup));
} }
} else { } else {
die "No such file: $file\n"; die "No such file: $file";
} }
} }
@ -270,7 +270,7 @@ sub cvsadd($) {
print "FILE: $file\n"; print "FILE: $file\n";
print "PATH: $checkpath\n"; print "PATH: $checkpath\n";
chdir $cwd; chdir $cwd;
copy($file, $checkpath) || die "error copying file to cvstree: $!\n"; copy($file, $checkpath) || die "error copying file to cvstree: $!";
chdir $checkpath; chdir $checkpath;
system("$cvscmd add " . &escape(basename($file))); system("$cvscmd add " . &escape(basename($file)));
chdir $cwd; chdir $cwd;
@ -324,10 +324,10 @@ sub cmptocvs($) {
sub cmp($$) { sub cmp($$) {
my $source = shift; my $source = shift;
my $target = shift; my $target = shift;
open(FH, "<$source") or die "Couldn't open file $source: $!\n"; open(FH, "<$source") or die "Couldn't open file $source: $!";
my $sf = do { local $/; <FH> }; my $sf = do { local $/; <FH> };
close(FH); close(FH);
open(FH, "<$target") or die "Couldn't open file $target: $!\n"; open(FH, "<$target") or die "Couldn't open file $target: $!";
my $tf = do { local $/; <FH> }; my $tf = do { local $/; <FH> };
close(FH); close(FH);
$tf eq $sf; $tf eq $sf;
@ -368,7 +368,7 @@ sub fullpath($) {
sub slurp($) { sub slurp($) {
my $file = shift; my $file = shift;
open(FH, "<$file") or die "Couldn't open $file: $!\n"; open(FH, "<$file") or die "Couldn't open $file: $!";
my $result = do { local $/; <FH>; }; my $result = do { local $/; <FH>; };
close FH; close FH;
return $result; return $result;