add an archive dir

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

1 files changed, 11 insertions, 11 deletions

diff --git a/Master/tlpkg/bin/tl-update-makeself b/Master/tlpkg/bin/tl-update-makeself
index b170afcf6fd..4b8728c30b0 100755
--- a/Master/tlpkg/bin/tl-update-makeself
+++ b/Master/tlpkg/bin/tl-update-makeself
@@ -68,14 +68,14 @@ sub main
       $f = "./$f";
     }
     my ($dn, $fn) = TeXLive::TLUtils::dirname_and_basename($f);
-    `mkdir -p \"$tmpdir/master/$dn\"`;
-    `cp -a \"$Master/$f\" \"$tmpdir/master/$f\"`;
+    system("mkdir -p \"$tmpdir/master/$dn\"");
+    system("cp -a \"$Master/$f\" \"$tmpdir/master/$f\"");
   }
 
   # get highest rev of all these packages.
   my $rev = 0;
   for my $p (@packs) {
-    $rev = $p->revision if $rev > $p->revision;
+    $rev = $p->revision if $rev < $p->revision;
   }
 
   # we have to create the tlpobj files, too
@@ -98,15 +98,15 @@ sub main
 
 ROOT=`kpsewhich --var-value=SELFAUTOPARENT`
 if [ -r "$ROOT/tlpkg/texlive.tlpdb" ] ; then
-  my ./master/bin .
-  cp -a ./master/* "$ROOT/"
+  mv ./master/bin .
+  cp -a ./master/* $ROOT/
   # now try to get the list of installed architectures by listing the
   # directories in $ROOT/bin
-  tlpobjs="\"$ROOT/tlpkg/tlpobj/bin-texlive.tlpobj\" \"$ROOT/tlpkg/tlpobj/texlive.infra\""
-  for a in "$ROOT/bin/*" ; do
+  tlpobjs="$ROOT/tlpkg/tlpobj/bin-texlive.tlpobj $ROOT/tlpkg/tlpobj/texlive.infra.tlpobj"
+  for a in $ROOT/bin/* ; do
     b=`basename $a`
     cp -a bin/$b "$ROOT/bin/"
-    tlpobjs="$tlpobjs \"$ROOT/tlpkg/tlpobj/bin-texlive.$b\" \"$ROOT/tlpkg/tlpobj/texlive.infra.$b\""
+    tlpobjs="$tlpobjs $ROOT/tlpkg/tlpobj/bin-texlive.$b.tlpobj $ROOT/tlpkg/tlpobj/texlive.infra.$b.tlpobj"
   done
 else
   # could be made more intelligent
@@ -117,14 +117,14 @@ else
   exit 1
 fi
 
-echo tlmgr _include_tlpobj $tlpobjs
+tlmgr _include_tlpobj $tlpobjs
 
 EOF
 
   close(RUN);
-  `chmod ugo+x "$tmpdir/runme.sh"`;
+  system("chmod ugo+x \"$tmpdir/runme.sh\"");
 
-  `makeself "$tmpdir" update-texlive-${rev}.run \"TeX Live Manager Updater ${rev}\" ./runme.sh`;
+  system("makeself \"$tmpdir\" update-texlive-${rev}.run \"TeX Live Manager Updater ${rev}\" ./runme.sh");
 
   return(0);
 }