From 917d88e18565c63eafc33a5257b48626365dddef Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Feb 2020 22:21:35 +0000 Subject: texosquery (4feb20) git-svn-id: svn://tug.org/texlive/trunk@53676 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/texosquery/texosquery-jre5.sh | 16 ++++++++++------ .../texlive/linked_scripts/texosquery/texosquery-jre8.sh | 16 ++++++++++------ .../texk/texlive/linked_scripts/texosquery/texosquery.sh | 16 ++++++++++------ 3 files changed, 30 insertions(+), 18 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre5.sh b/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre5.sh index a72924f360a..73edbe03205 100755 --- a/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre5.sh +++ b/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre5.sh @@ -1,11 +1,15 @@ #!/bin/sh -kernel=`uname -s` -if test "${kernel#*CYGWIN}" != "$kernel" -then - jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre5.jar)` -else - jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre5.jar` +scriptname=`basename "$0" .sh` +jar="$scriptname.jar" +jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"` + +kernel=`uname -s 2>/dev/null` +if echo "$kernel" | grep CYGWIN >/dev/null; then + CYGWIN_ROOT=`cygpath -w /` + export CYGWIN_ROOT + jarpath=`cygpath -w "$jarpath"` fi + java -jar "$jarpath" "$@" diff --git a/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre8.sh b/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre8.sh index f68a09c8660..77411bcf87d 100755 --- a/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre8.sh +++ b/Build/source/texk/texlive/linked_scripts/texosquery/texosquery-jre8.sh @@ -1,11 +1,15 @@ #!/bin/sh -kernel=`uname -s` -if test "${kernel#*CYGWIN}" != "$kernel" -then - jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre8.jar)` -else - jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre8.jar` +scriptname=`basename "$0" .sh` +jar="$scriptname.jar" +jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"` + +kernel=`uname -s 2>/dev/null` +if echo "$kernel" | grep CYGWIN >/dev/null; then + CYGWIN_ROOT=`cygpath -w /` + export CYGWIN_ROOT + jarpath=`cygpath -w "$jarpath"` fi + java -Djava.locale.providers=CLDR,JRE -jar "$jarpath" "$@" diff --git a/Build/source/texk/texlive/linked_scripts/texosquery/texosquery.sh b/Build/source/texk/texlive/linked_scripts/texosquery/texosquery.sh index d230c4c1999..73edbe03205 100755 --- a/Build/source/texk/texlive/linked_scripts/texosquery/texosquery.sh +++ b/Build/source/texk/texlive/linked_scripts/texosquery/texosquery.sh @@ -1,11 +1,15 @@ #!/bin/sh -kernel=`uname -s` -if test "${kernel#*CYGWIN}" != "$kernel" -then - jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery.jar)` -else - jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery.jar` +scriptname=`basename "$0" .sh` +jar="$scriptname.jar" +jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"` + +kernel=`uname -s 2>/dev/null` +if echo "$kernel" | grep CYGWIN >/dev/null; then + CYGWIN_ROOT=`cygpath -w /` + export CYGWIN_ROOT + jarpath=`cygpath -w "$jarpath"` fi + java -jar "$jarpath" "$@" -- cgit v1.2.3