From 03e24a3c99e6763967e156890e12d9d67efd9aae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 9 May 2014 00:33:41 +0000 Subject: pdfcsplain executable link -> pdftex git-svn-id: svn://tug.org/texlive/trunk@33925 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/armel-linux/pdfcsplain | 2 +- Master/texmf-dist/scripts/texlive/texlinks.sh | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'Master') diff --git a/Master/bin/armel-linux/pdfcsplain b/Master/bin/armel-linux/pdfcsplain index 8d727021583..f68cc91498e 120000 --- a/Master/bin/armel-linux/pdfcsplain +++ b/Master/bin/armel-linux/pdfcsplain @@ -1 +1 @@ -luatex \ No newline at end of file +pdftex \ No newline at end of file diff --git a/Master/texmf-dist/scripts/texlive/texlinks.sh b/Master/texmf-dist/scripts/texlive/texlinks.sh index ee1be108ff2..028b50be9c4 100755 --- a/Master/texmf-dist/scripts/texlive/texlinks.sh +++ b/Master/texmf-dist/scripts/texlive/texlinks.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: texlinks.sh 29349 2013-03-12 00:01:41Z karl $ +# $Id: texlinks.sh 33924 2014-05-09 00:31:04Z karl $ # Thomas Esser, 1999, 2002, 2003. public domain. @@ -39,7 +39,7 @@ export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' -version='$Id: texlinks.sh 29349 2013-03-12 00:01:41Z karl $' +version='$Id: texlinks.sh 33924 2014-05-09 00:31:04Z karl $' progname=texlinks cnf=fmtutil.cnf # name of the config file @@ -167,14 +167,18 @@ install_link() rm -f "$src" if test -f "$src"; then - case $silent in - true) - ;; - *) - errmsg "install_link $src -> $dest failed: file already exists." - ;; - esac + if $silent; then :; else + # i.e., the rm failed. + errmsg "install_link $src -> $dest failed: file already exists." + fi else + if echo "$src" | grep '/pdfcsplain$' >/dev/null; then + # at p.olsak insistence: we have three pdfcsplain entries in + # fmtutil.cnf with different engines, but the executable link + # must point to pdftex. + verbose_echo "forcing pdfcsplain destination to be pdftex" + dest=pdftex + fi verbose_do ln -s "$dest" "$src" fi ;; -- cgit v1.2.3