Changeset 745


Ignore:
Timestamp:
May 4, 2008, 12:04:56 AM (14 years ago)
Author:
price
Message:
more never-committed changes from last time

I don't know where these changes went.  Reconstructed here.
Location:
locker/sbin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • locker/sbin/build-update

    r744 r745  
    8888
    8989copy(catfile($proposaldir, "update.diff"), catfile($outdir, "update.diff")) or die "Couldn't copy update.diff: $!";
     90if (-d catdir($proposaldir, "extra")) {
     91    system('cp', '-r', catdir($proposaldir, "extra"), $outdir) && die "Couldn't copy extra: $!";
     92}
    9093
    9194open (SCRIPT, ">", catfile($outdir, "update")) or die "Couldn't write update: $!";
  • locker/sbin/propose-update

    r741 r745  
    5050  my @files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`;
    5151  if (@files <= 1) {
    52     `athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -i mv \{} .`;
     52    `athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -I{} mv \{} .`;
    5353    rmdir($files[0]);
    5454  }
     
    5757}
    5858
    59 my @oldfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$olddir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $olddir -type f | xargs -i md5sum \{}`;
     59my @oldfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$olddir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $olddir -type f | xargs -I{} md5sum \{}`;
    6060#print Dumper(\@oldfiles);
    61 my @newfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$newdir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $newdir -type f | xargs -i md5sum \{}`;
     61my @newfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$newdir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $newdir -type f | xargs -I{} md5sum \{}`;
    6262#print Dumper(\@newfiles);
    6363
Note: See TracChangeset for help on using the changeset viewer.