Changeset 12

Timestamp:

10/04/06 17:37:10 (7 years ago)

Author:

lincoln

Message:

--mirror support added with fallback to whuffy if all mirrors are down

Files:

• shepherd (modified) (11 diffs)

shepherd

@@ -23 +23 @@
 #
 # ToDo:
-# * --mirror <url> option, to let you get software from somewhere other
-#   than whuffy. Store this in shepherd.conf. Whuffy is merely the first
-#   mirror.
 # * Make it check compilation after installing by calling --version or
 #   --desc or --ready
@@ -50 +47 @@
 
 my $HOME = 'http://www.whuffy.com';
-my $STATUS = "$HOME/status";
 
 my $invoked = Cwd::realpath($0);
@@ -71 +67 @@
 my $opt;
 my $pref_order;
+my $mirror_site;
 my $made_changes = 0;
 my $debug = 1;
@@ -138 +135 @@
 &check() if ($opt->{check});
 
-if ($opt->{enable} or $opt->{disable} or $opt->{setorder} or $opt->{check})
+if ($opt->{enable} or $opt->{disable} or $opt->{setorder} or $opt->{check} or $opt->{mirror})
 {
     set_order(1) if $made_changes;
@@ -539 +536 @@
     printf "\nChecking for updates:\n\n";
 
-    print "Fetching status file: $STATUS.";
-    my $data = LWP::Simple::get($STATUS);
-    unless ($data)
-    {
-        print "Failed to retrieve status file.\n";
-        return;
-    }
+    my $data;
+    my $sites = "";
+    $sites = "$mirror_site," if ($mirror_site);
+    $sites .= $HOME;
+
+    foreach my $site (split(/,/,$sites)) {
+        my $url = $site . "/status";
+        print "Fetching status file: $url.\n";
+        $data = LWP::Simple::get($url);
+        last if $data;
+
+        print "Failed to retrieve status file from $url.\n";
+    }
+    return if (!$data);
 
     my %glist = %$grabbers;
@@ -635 +639 @@
     print "Downloading $proggy v$latestversion.\n";
 
-    my $rdir = $HOME;
+    my $sites = "";
+    $sites = "$mirror_site," if ($mirror_site);
+    $sites .= $HOME;
+
+    my $rdir = "";
     my $ldir = $CWD;
-    my $ver = "unkown";
+    my $ver = "unknown";
 
     if (($proggy eq $progname) && ($progtype eq "shepherd")) {
-        $rdir = $HOME;
-        $ldir = $CWD;
         $ver = $version;
     } elsif ($progtype eq "grabber") {
-        $rdir = $HOME . "/grabbers";
+        $rdir = "grabbers";
         $ldir = "$GRABBER_DIR/$proggy";
         $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";
+        $rdir = "postprocessors";
         $ldir = "$POSTPROCESSOR_DIR/$proggy";
         $ver = $postprocessors->{$proggy}->{ver} if ((defined $postprocessors->{$proggy}) && $postprocessors->{$proggy}->{ver});
@@ -660 +666 @@
 
     my $newfile = "$ldir/$proggy-$latestversion";
-    my $rc = LWP::Simple::getstore("$rdir/$proggy-$latestversion", $newfile);
-
-    unless (is_success($rc))
-    {
-        print "Failed to retrieve $rdir/$proggy-$latestversion.\n";
-        return;
-    }
+    my $rc;
+
+    foreach my $site (split(/,/,$sites)) {
+        printf "Fetching $site/$rdir/$proggy-$latestversion.\n";
+        $rc = LWP::Simple::getstore("$site/$rdir/$proggy-$latestversion", $newfile);
+        last if (is_success($rc));
+
+        print "Failed to retrieve $site/$rdir/$proggy-$latestversion.\n";
+    }
+    return if (!is_success($rc));
 
     # Make it executable
@@ -835 +844 @@
         &set_order(1);
     }
+
+    # if a mirror has been specified, add it into our config
+    if ($opt->{mirror}) {
+        $mirror_site = $opt->{mirror};
+        $made_changes = 1;
+        print "Adding mirror: $mirror_site\n";
+    }
 }
 
@@ -872 +888 @@
     open(CONF, ">$config_file") or die "cannot write to $config_file: $!";
     print CONF Data::Dumper->Dump(
-        [$region,  $pref_order,   $grabbers, $postprocessors  ],
-        ["region", "pref_order", "grabbers", "postprocessors" ]);
+        [$region,  $pref_order,  $mirror_site,  $grabbers, $postprocessors  ],
+        ["region", "pref_order", "mirror_site", "grabbers", "postprocessors" ]);
     close CONF;
     print "\nUpdated configuration file $config_file.\n" if ($debug);
@@ -892 +908 @@
               'configure'       => \$opt->{configure},
               'output'          => \$opt->{output},
+              'mirror=s'        => \$opt->{mirror},
               'debug'           => \$debug);
 }
@@ -1101 +1118 @@
     --status              Print a list of grabbers maintained
     --list                Print a detailed list of grabbers
+    --mirror <s>          Set URL <s> as primary location to check for updates
 
     --configure           Setup