Changeset 285

Timestamp:

11/23/06 18:15:11 (7 years ago)

Author:

max

Message:

Added &countdown() (in both shepherd and dog, alas)

Files:

• applications/shepherd (modified) (3 diffs)
• engines/dog (modified) (2 diffs)

applications/shepherd

@@ -189 +189 @@
            "    as '".query_filename('shepherd','application')."'\n".
            "    rather than '$invoked'!\n".
-           "    Auto-update has been disabled until you fix this!\n\n".
-           "You may wish to CTRL-C and fix this.\n".
-           "Continuing (without auto-update) in: ");
-        foreach (1 .. 10)
-        {
-            print " " . (11 - $_);
-            sleep 1;
-        }
+           "    Auto-update has been disabled until you fix this!\n\n");
+        &countdown();
         &log("\nSkipped auto-update.\n\n");
         return 0;
@@ -605 +599 @@
 }
 
+sub countdown
+{
+    my $n = shift;
+
+    $n ||= 10;
+    print "You may wish to CTRL-C and fix this.\n\nContinuing anyway in:";
+    foreach (1 .. $n)
+    {
+        print " " . ($n + 1 - $_);
+        sleep 1;
+    }
+    print "\n";
+}
+
 sub rotate_logfiles
 {
@@ -776 +784 @@
     {
         warn "\nERROR in $name file! Details:\n$@";
-        print "You may wish to CTRL-C and fix this.\n\nContinuing anyway in:";
-        foreach (1 .. 5)
-        {
-            print " " . (6 - $_);
-            sleep 1;
-        }
-        print "\n";
+        &countdown();
     }
 }

engines/dog

@@ -1582 +1582 @@
 }
 
+sub countdown
+{
+    my $n = shift;
+
+    $n ||= 10;
+    print "You may wish to CTRL-C and fix this.\n\nContinuing anyway in:";
+    foreach (1 .. $n)
+    {
+        print " " . ($n + 1 - $_);
+        sleep 1;
+    }
+    print "\n";
+}
+
 sub call_prog
 {
@@ -1662 +1676 @@
     {
         warn "\nERROR in $name file! Details:\n$@";
-        print "You may wish to CTRL-C and fix this.\n\nContinuing anyway in:";
-        foreach (1 .. 5)
-        {
-            print " " . (6 - $_);
-            sleep 1;
-        }
-        print "\n";
+        &countdown();
     }
 }