Changeset 9 for shepherd

Timestamp:

10/04/06 06:03:30 (7 years ago)

Author:

lincoln

Message:

fix update/install logic regressions

Files:

• shepherd (modified) (10 diffs)

shepherd

@@ -151 +151 @@
 {
     update($progname, $version);
+    set_order(1) if $made_changes;
     write_config_file() unless ($opt->{configure});
 }
@@ -564 +565 @@
 
     # handle new installs..
-    if (($$proggy eq $progname) && ($progtype eq "shepherd")) {
+    if (($proggy eq $progname) && ($progtype eq "shepherd")) {
         # shepherd itself..
         if(! -e "$CWD/$progname") {
@@ -572 +573 @@
         }
     } elsif ($progtype eq "grabber") {
-        if (!$grabbers->{$proggy} or ! -e "$GRABBER_DIR/$proggy/$proggy") {
+        if (!defined $grabbers->{$proggy} or ! -e "$GRABBER_DIR/$proggy/$proggy") {
             print "New grabber: $proggy.\n";
             install($proggy, $latestversion, $progtype);
@@ -579 +580 @@
         print "Warning: grabber $proggy disabled by config file.\n" if ($grabbers->{$proggy}->{disabled});
     } elsif ($progtype eq "postprocessor") {
-        if (!$postprocessors->{$proggy} or ! -e "$POSTPROCESSOR_DIR/$proggy/$proggy") {
+        if (!defined $postprocessors->{$proggy} or ! -e "$POSTPROCESSOR_DIR/$proggy/$proggy") {
             print "New postprocessor: $proggy.\n";
             install($proggy, $latestversion, $progtype);
@@ -593 +594 @@
     } elsif ($progtype eq "postprocessor") {
         $ver = ($proggy eq $progname ? $version : $postprocessors->{$proggy}->{ver});
-    } elsif (($$proggy eq $progname) && ($progtype eq "shepherd")) {
+    } elsif (($proggy eq $progname) && ($progtype eq "shepherd")) {
         $ver = $version;
     } else {
@@ -620 +621 @@
     my $rdir = $HOME;
     my $ldir = $CWD;
-    my $ver = $version;
-
-    if (($$proggy eq $progname) && ($progtype eq "shepherd")) {
+    my $ver = "unkown";
+
+    if (($proggy eq $progname) && ($progtype eq "shepherd")) {
         $rdir = $HOME;
         $ldir = $CWD;
@@ -629 +630 @@
         $rdir = $HOME . "/grabbers";
         $ldir = "$GRABBER_DIR/$proggy";
-        $ver = $grabbers->{$proggy}->{ver};
+        $ver = $grabbers->{$proggy}->{ver} if ((defined $grabbers->{$proggy}) && $grabbers->{$proggy}->{ver});
         -d $GRABBER_DIR or mkdir $GRABBER_DIR or die "Cannot create directory $GRABBER_DIR: $!";
     } elsif ($progtype eq "postprocessor") {
         $rdir = $HOME . "/postprocessors";
         $ldir = "$POSTPROCESSOR_DIR/$proggy";
-        $ver = $postprocessors->{$proggy}->{ver};
+        $ver = $postprocessors->{$proggy}->{ver} if ((defined $postprocessors->{$proggy}) && $postprocessors->{$proggy}->{ver});
         -d $POSTPROCESSOR_DIR or mkdir $POSTPROCESSOR_DIR or die "Cannot create directory $POSTPROCESSOR_DIR: $!";
     } else {
@@ -665 +666 @@
 
     # if the update was for shepherd itself, restart it
-    if (($$proggy eq $progname) && ($progtype eq "shepherd")) {
+    if (($proggy eq $progname) && ($progtype eq "shepherd")) {
         print "\n*** Restarting ***\n\n";
         exec("$ldir/$proggy");
@@ -1053 +1054 @@
         printf  " %-16s %8s %4s %6s  %11s %s\n",
                 "$h->{order}. $_",
-                $h->{ver},
+                ($h->{ver} ? $h->{ver} : "unknown"),
                 $h->{disabled} ? '' : 'Y',
                 $h->{ready} ? 'Y' : '',
-                $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : '',
+                $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
                 $h->{laststatus} ? $h->{laststatus} : '';
     }
@@ -1067 +1068 @@
         printf  " %-16s %8s %4s %6s  %11s %s\n",
                 $_,
-                $h->{ver},
+                ($h->{ver} ? $h->{ver} : "unknown"),
                 $h->{disabled} ? '' : 'Y',
                 $h->{ready} ? 'Y' : '',
-                $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : '',
+                $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
                 $h->{laststatus} ? $h->{laststatus} : '';
     }