tl-update-containers: allow for scriptsdir and master to be different

git-svn-id: svn://tug.org/texlive/trunk@40644 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 4 deletions

diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 6b3c8c8abb9..cb993da04f6 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -23,6 +23,8 @@ use Getopt::Long;
 use Pod::Usage;
 use File::Path;
 
+my $script_master;
+
 # packages matching these re's will not be updated without --all.
 my @critical_pkg_list = qw/texlive\.infra tlperl\.win32/;
 
@@ -36,6 +38,7 @@ my $opt_version = 0;
 my $opt_help = 0;
 my $opt_dry = 0;
 my $opt_gpgcmd = "";
+my $opt_master;
 
 TeXLive::TLUtils::process_logging_options();
 GetOptions(
@@ -46,6 +49,7 @@ GetOptions(
   "recreate"    => \$opt_recreate,
   "relative!"   => \$opt_relative,
   "version"	=> \$opt_version,
+  "master=s"    => \$opt_master,
   "gpgcmd=s"    => \$opt_gpgcmd,
   "help|?"      => \$opt_help) or pod2usage(1);
 
@@ -64,15 +68,16 @@ sub main
   }
 
   # get source db, same hierarchy from which we are being run.
-  chomp(my $Master = `cd $mydir/../.. && pwd`);
+  chomp(my $script_master = `cd $mydir/../.. && pwd`);
+  my $Master = ($opt_master ? $opt_master : $script_master);
   my $tlpdb = TeXLive::TLPDB->new("root" => $Master);
   die "cannot find tlpdb in $Master" unless defined($tlpdb);
   my @packs = $tlpdb->expand_dependencies("-only-arch", $tlpdb,
                                         @ARGV ? @ARGV : $tlpdb->list_packages);
 
-  # if no argument is passed in, we use tl-sign-file from Master
+  # if no argument is passed in, we use tl-sign-file from script_master
   if (!$opt_gpgcmd) {
-    $opt_gpgcmd = "$Master/tlpkg/bin/tl-sign-file";
+    $opt_gpgcmd = "$script_master/tlpkg/bin/tl-sign-file";
   }
 
   # get configuration of package splitting
@@ -204,7 +209,7 @@ sub main
     $::progs{'tar'} = "tar";
   } else {
     # do a full setup
-    my $ret = &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer");
+    my $ret = &TeXLive::TLUtils::setup_programs("$script_master/tlpkg/installer");
     if ($ret == -1) {
       tlwarn("$0: no xzdec for $::_platform_, aborting.\n");
       exit 1;
@@ -436,6 +441,10 @@ tl-update-containers [I<option>]...
 The directory of containers to be updated, usually with a previous set
 of containers to be compared against; default is C<./archive>.
 
+=item B<-master> I</path/to/source>
+
+The directory from which containers should be updated. 
+
 =item B<-recreate>
 
 Forces rebuild of all containers, including creation of the output