Changeset 1384 for trunk/locker

Timestamp:

Dec 22, 2009, 6:05:14 PM (14 years ago)

Author:

ezyang

Message:

Make parallel find /actually/ work with Wizard autoinstalls.

File:

• trunk/locker/sbin/parallel-find.pl (modified) (3 diffs)

trunk/locker/sbin/parallel-find.pl

@@ -55 +55 @@
 sub version ($) {
     my $dirname = shift;
-    open my $h, "$dirname/.scripts/version";
-    return (<$h>)[-1];
+    $uid = stat($dirname)->uid;
+    open my $h, "sudo -u #$uid git describe --tags 2>/dev/null |";
+    chomp($val = <$h>);
+    return $val;
 }
 
@@ -67 +69 @@
     while (my $f = <$files>) {
         chomp $f;
-        my $old_style;
-        $old_style = ($f =~ s!/\.scripts-version$!!);
-        if (! $old_style) {
-            $f =~ s!/\.scripts$!!;
+        my $new_style;
+        $new_style = ($f =~ s!/\.scripts$!!);
+        if (! $new_style) {
+            $f =~ s!/\.scripts-version$!!;
         }
         if (! updatable($f)) {
@@ -76 +78 @@
             next;
         }
-        $v = $old_style ? old_version($f) : version($f);
+        $v = $new_style ? version($f) : old_version($f);
         print $out "$f:$v";
     }