Changeset 599 for applications/shepherd

Timestamp:

03/06/07 17:34:42 (6 years ago)

Author:

lincoln

Message:

change --noupdate logic around: shepherd will now always check whuffy for updates and then whinge to the user if they have set --noupdate but there are updates pending. it will still honour the --noupdate and not actually download or apply the updates though.

Files:

• applications/shepherd (modified) (5 diffs)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.74';
+my $version = '0.4.75';
 
 # tv_grab_au
@@ -189 +189 @@
 # ---------------------------------------------------------------------------
 
-unless ($opt->{noupdate})
-{
-    if (&update()) 
-    {
-        &write_config_file;
-    }
+if (&update())
+{
+    &write_config_file;
 }
 
@@ -282 +279 @@
         if (update_component($proggy, $latestversion, $progtype, $csum1, $csum2))
         {
-            $made_changes = 1;
+            $made_changes++;
         }
         delete $clist{$proggy};
+    }
+
+    # if user has set system to not update, then simply tell them if there are updates
+    if ((defined $opt->{noupdate}) && ($made_changes)) {
+        &log(2,"\n$made_changes components with pending updates, but --noupdate specified.\n".
+               "It is recommended that you manually run --update at your earliest convenience,\n".
+                "as these updates may be for critical bugfixes!\n\n");
+        &countdown(20);
+        return 0;
     }
 
@@ -292 +298 @@
             &log("\nDeleted component: $_.\n");
             disable($_, 2);
-            $made_changes = 1;
+            $made_changes++;
         }
     }
@@ -335 +341 @@
     {
         $result = &versioncmp($ver, $latestversion);
-        $action =    $result == -1 ? ($ver ? "UPGRADING" : "NEW") :
-                     $result ==  1 ? "DOWNGRADING" :
-                                     "up to date";
-    }
-    &log(sprintf    "* %-55s%16s\n",
+
+        if (!defined $opt->{noupdate}) {
+            $action =  $result == -1 ? ($ver ? "UPGRADING" : "NEW") :
+                       $result ==  1 ? "DOWNGRADING" :
+                                       "up to date";
+        } else {
+            $action =  $result == -1 ? ($ver ? "UPDATE AVAILABLE" : "NEW COMPONENT") :
+                       $result ==  1 ? "DOWNGRADE ADVISED" :
+                                       "up to date";
+        }
+    }
+    &log(2,sprintf  "* %-54s%17s\n",
                     ucfirst($progtype) . " $proggy" .
                         ($ver ? " v$ver" : '') . "...",
                     $action);
+
+    return $result if (defined $opt->{noupdate});
     return 0 unless ($result);
     install($proggy, $latestversion, $progtype, $ver, $csum1, $csum2);