Changeset 745 for locker

Timestamp:

May 4, 2008, 12:04:56 AM (18 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:

• build-update (modified) (1 diff)
• propose-update (modified) (2 diffs)

locker/sbin/build-update

@@ -88 +88 @@
 
 copy(catfile($proposaldir, "update.diff"), catfile($outdir, "update.diff")) or die "Couldn't copy update.diff: $!";
+if (-d catdir($proposaldir, "extra")) {
+    system('cp', '-r', catdir($proposaldir, "extra"), $outdir) && die "Couldn't copy extra: $!";
+}
 
 open (SCRIPT, ">", catfile($outdir, "update")) or die "Couldn't write update: $!";

locker/sbin/propose-update

@@ -50 +50 @@
   my @files=`athrun scripts gfind . -mindepth 1 -maxdepth 1 | grep -v .admin`;
   if (@files <= 1) {
-    `athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -i mv \{} .`;
+    `athrun scripts gfind . -mindepth 2 -maxdepth 2 | xargs -I{} mv \{} .`;
     rmdir($files[0]);
   }
@@ -57 +57 @@
 }
 
-my @oldfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$olddir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $olddir -type f | xargs -i md5sum \{}`;
+my @oldfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$olddir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $olddir -type f | xargs -I{} md5sum \{}`;
 #print Dumper(\@oldfiles);
-my @newfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$newdir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $newdir -type f | xargs -i md5sum \{}`;
+my @newfiles = sort { $a->[1] cmp $b->[1] } map { chomp; s|$newdir\/?||g; [split(' ', $_, 2)] } `athrun scripts gfind $newdir -type f | xargs -I{} md5sum \{}`;
 #print Dumper(\@newfiles);