update for new tlpkg/bin location

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

2 files changed, 19 insertions, 36 deletions

diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 24a98a46c32..fa9d637b71b 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -5,18 +5,17 @@
 # Deal with files that are automatically updated in one way or another.
 # New files need to be added manually, doesn't happen often enough.
 
-PATH=/usr/local/bin:$PATH; export PATH
+PATH=/usr/local/gnu/bin:/usr/local/bin:$PATH; export PATH
 umask 0
 
 chicken=echo
 chicken=
 cp="cp -fv"
+mv="mv -fv"
 diff="diff -U 2"
 
-tools=`cd \`dirname $0\` && /bin/pwd`
-
-# most stuff is in Master.
-Master=`cd $tools/../../Master && /bin/pwd`
+mydir=`cd \`dirname $0\` && /bin/pwd`
+Master=`cd $mydir/../.. && /bin/pwd`
 cd $Master || exit 1
 
 temp=/tmp/ua$$
@@ -26,7 +25,7 @@ update_list=
 
 #  autogenerate README.EN from readme.html.
 # 
-$tools/htmltext <readme.en.html >$temp
+$mydir/htmltext <readme.html/readme.en.html >$temp
 if $diff README.EN $temp >$temp.en.diff; then
   echo "  README.EN ok."
 else
@@ -36,27 +35,6 @@ else
 fi
 
 
-#  English FAQ from ctan mirror on tug.org.
-#
-faqmaster=/home/ftp/tex-archive/help/uk-tex-faq
-faqslave=texmf-doc/doc/english/FAQ-en
-for f in $faqmaster/*; do
-  # ignore some of the generated files
-  echo $f | egrep '(tar.gz|dvi|ps|letterfaq.pdf)$' >/dev/null \
-  && continue
-
-  basef=`basename $f`
-  faqslavef=$faqslave/$basef
-  if $diff $faqslavef $f >$temp.$basef.diff; then
-    echo "    $faqslavef ok."
-  else
-    $chicken $cp $f $faqslavef
-    update_list="$update_list $faqslavef"
-  fi
-done
-# for now, don't bother auto-updating the html files.
-
-
 #  modes.mf from elsewhere on tug.org.
 #
 modesmaster=/home/ftp/tex/modes.mf
@@ -129,9 +107,9 @@ for basef in $files; do
 done
  
 
-#  config.{guess,sub} from GNU.
+#  config.guess from GNU.
 # 
-for gnuconf in config.guess config.sub; do
+for gnuconf in config.guess; do
   url="http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/$gnuconf?rev=HEAD&content-type=text/plain"
   wget -O $temp $url >$temp.2 2>&1
   if test ! -s $temp; then
@@ -139,11 +117,13 @@ for gnuconf in config.guess config.sub; do
     cat $temp.2
     continue
   fi
-  if $diff $gnuconf $temp >$temp.$gnuconf.diff; then
+  gnuconffile=tlpkg/installer/$gnuconf
+  if $diff $gnuconffile $temp >$temp.$gnuconf.diff; then
     echo "  $gnuconf ok."
+    rm -f $temp
   else
-    $chicken $cp $temp $gnuconf
-    update_list="$update_list $gnuconf"
+    $chicken $mv $temp $gnuconffile
+    update_list="$update_list $gnuconffile"
 
     # find all copies in source.
     alldev="`find ../Build/source -name $gnuconf`"
@@ -157,13 +137,16 @@ done
 
 #  doc.html.
 #
-$tools/mkdocindex | tee $temp.doc | grep -v '<small>Generated' >$temp.doc.new
+$mydir/tl-update-docindex | tee $temp.doc \
+| grep -v '<small>Generated' >$temp.doc.new
+cp $temp.doc.new /tmp/x
+
 #
 grep -v '<small>Generated' doc.html >$temp.doc.cur
 if $diff $temp.doc.cur $temp.doc.new >$temp.doc.diff; then
   echo "  doc.html ok."
 else
-  $chicken cp -v $temp.doc.new doc.html
+  $chicken $cp $temp.doc.new doc.html
   update_list="$update_list doc.html"
 fi
 
diff --git a/Master/tlpkg/bin/tl-update-docindex b/Master/tlpkg/bin/tl-update-docindex
index 4e7630686f4..bdbd79cea56 100755
--- a/Master/tlpkg/bin/tl-update-docindex
+++ b/Master/tlpkg/bin/tl-update-docindex
@@ -10,8 +10,8 @@ sub main
   (my $progname = $0) =~ s,^.*/,,;
   umask (0);
   
-  chomp (my $mydir = `dirname $0`); # Tools
-  chdir ("$mydir/../../Master") || exit 1;    # Master
+  chomp (my $mydir = `dirname $0`);
+  chdir ("$mydir/../..") || exit 1;    # Master
 
   # shell fragment we use to find doc files in a directory.
   $ENV{"_POSIX2_VERSION"} = 0;  # POSIX likes to be backward-incompatible