From 39b00ae32d953c3b0d2e1c7a1833e15efcc78cb2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 Mar 2020 01:37:49 +0000 Subject: finish lua2dox removal git-svn-id: svn://tug.org/texlive/trunk@54316 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/texk/texlive/linked_scripts/Makefile.am | 1 - .../source/texk/texlive/linked_scripts/Makefile.in | 1 - .../texlive/linked_scripts/lua2dox/lua2dox_filter | 86 ---------------------- .../source/texk/texlive/linked_scripts/scripts.lst | 1 - .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 27 +++---- 5 files changed, 14 insertions(+), 102 deletions(-) delete mode 100755 Build/source/texk/texlive/linked_scripts/lua2dox/lua2dox_filter (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 2a11c0e17ce..d8864438c13 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -65,7 +65,6 @@ texmf_shell_scripts = \ listbib/listbib \ listings-ext/listings-ext.sh \ ltxfileinfo/ltxfileinfo \ - lua2dox/lua2dox_filter \ pdfbook2/pdfbook2 \ pdfjam/pdfjam \ pdftex-quiet/pdftex-quiet \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 6f37c9b9a9e..5bf620beba6 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -278,7 +278,6 @@ texmf_shell_scripts = \ listbib/listbib \ listings-ext/listings-ext.sh \ ltxfileinfo/ltxfileinfo \ - lua2dox/lua2dox_filter \ pdfbook2/pdfbook2 \ pdfjam/pdfjam \ pdftex-quiet/pdftex-quiet \ diff --git a/Build/source/texk/texlive/linked_scripts/lua2dox/lua2dox_filter b/Build/source/texk/texlive/linked_scripts/lua2dox/lua2dox_filter deleted file mode 100755 index 822fed7bea1..00000000000 --- a/Build/source/texk/texlive/linked_scripts/lua2dox/lua2dox_filter +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -########################################################################### -# Copyright (C) 2012 by Simon Dales # -# simon@purrsoft.co.uk # -# # -# This program is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program; if not, write to the # -# Free Software Foundation, Inc., # -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -########################################################################### - -##! \brief test executable to see if it exists -test_executable(){ - P_EXE="$1" - ######### - WHICH=`which ${P_EXE}` - if test -z "${WHICH}" - then - echo "not found \"${P_EXE}\"" - else - EXE="${P_EXE}" - fi - } - -##! \brief sets the lua interpreter -set_lua(){ - test_executable 'texlua' - if test -z "${EXE}" - then - test_executable 'lua' - fi - #echo "final EXE=\"${EXE}\"" - } - -##! \brief makes canonical name of file -##! -##! Note that "readlink -f" doesn't work in MacOSX -##! -do_readlink(){ - pushd . > /dev/null - TARGET_FILE=$1 - - cd `dirname $TARGET_FILE` - TARGET_FILE=`basename $TARGET_FILE` - - # Iterate down a (possible) chain of symlinks - while [ -L "$TARGET_FILE" ] - do - TARGET_FILE=`readlink $TARGET_FILE` - cd `dirname $TARGET_FILE` - TARGET_FILE=`basename $TARGET_FILE` - done - - PHYS_DIR=`pwd -P` - RESULT=$PHYS_DIR - popd > /dev/null - } - -##main -set_lua -if test -z "${EXE}" -then - echo "no lua interpreter available" -else - BASENAME=`basename "$0"` - do_readlink "$0" - DIRNAME="${RESULT}" - - LUASCRIPT="${DIRNAME}/lua2dox.lua ${BASENAME}" - #echo "lua[${LUASCRIPT}]" - - ${EXE} ${LUASCRIPT} $@ -fi -# -##eof \ No newline at end of file diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index 5076cf363ba..e2b33e5bcb1 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -9,7 +9,6 @@ latexfileversion/latexfileversion listbib/listbib listings-ext/listings-ext.sh ltxfileinfo/ltxfileinfo -lua2dox/lua2dox_filter pdfbook2/pdfbook2 pdfjam/pdfjam pdftex-quiet/pdftex-quiet diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 63796163ae3..e76604ba58d 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 54118 2020-03-05 22:27:22Z karl $ +# $Id: tlmgr.pl 54286 2020-03-13 22:01:43Z karl $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 54118 $'; -my $datrev = '$Date: 2020-03-05 23:27:22 +0100 (Thu, 05 Mar 2020) $'; +my $svnrev = '$Revision: 54286 $'; +my $datrev = '$Date: 2020-03-13 23:01:43 +0100 (Fri, 13 Mar 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -5197,9 +5197,12 @@ sub uninstall_texlive { return ($F_ERROR); } return if !check_on_writable(); + + init_local_db(0); my $force = defined($opts{"force"}) ? $opts{"force"} : 0; if (!$force) { - print("If you answer yes here the whole TeX Live installation will be removed!\n"); + print("If you answer yes here the whole TeX Live installation here,\n", + "under ", $localtlpdb->root, ", will be removed!\n"); print "Remove TeX Live (y/N): "; my $yesno = ; if ($yesno !~ m/^y(es)?$/i) { @@ -5208,13 +5211,12 @@ sub uninstall_texlive { } } print ("Ok, removing the whole installation:\n"); - init_local_db(); TeXLive::TLUtils::remove_symlinks($localtlpdb->root, $localtlpdb->platform(), $localtlpdb->option("sys_bin"), $localtlpdb->option("sys_man"), $localtlpdb->option("sys_info")); - # now do remove the rest + # now remove the rest system("rm", "-rf", "$Master/texmf-dist"); system("rm", "-rf", "$Master/texmf-doc"); system("rm", "-rf", "$Master/texmf-var"); @@ -5222,15 +5224,17 @@ sub uninstall_texlive { system("rm", "-rf", "$Master/bin"); system("rm", "-rf", "$Master/readme-html.dir"); system("rm", "-rf", "$Master/readme-txt.dir"); - for my $f (qw/doc.html index.html LICENSE.CTAN LICENSE.TL README - README.usergroups release-texlive.txt texmf.cnf/) { + for my $f (qw/doc.html index.html install-tl + LICENSE.CTAN LICENSE.TL README README.usergroups + release-texlive.txt texmf.cnf texmfcnf.lua/) { system("rm", "-f", "$Master/$f"); } if (-d "$Master/temp") { system("rmdir", "--ignore-fail-on-non-empty", "$Master/temp"); } unlink("$Master/install-tl.log"); - # should we do that???? + # if they want removal, give them removal. Hopefully they know how to + # regenerate any changed config files. system("rm", "-rf", "$Master/texmf-config"); system("rmdir", "--ignore-fail-on-non-empty", "$Master"); } @@ -6688,9 +6692,6 @@ sub action_shell { # 2 : not even TLPDB needs to be found # if we cannot read tlpdb, die if arg SHOULD_I_DIE is true. # -# if an argument is given and is true init_local_db will die if -# setting up of programs failed. -# sub init_local_db { my ($should_i_die) = @_; defined($should_i_die) or ($should_i_die = 0); @@ -10009,7 +10010,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 54118 2020-03-05 22:27:22Z karl $ +$Id: tlmgr.pl 54286 2020-03-13 22:01:43Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3