diff options
author | Karl Berry <karl@freefriends.org> | 2019-07-11 21:18:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-07-11 21:18:13 +0000 |
commit | d9fdc45f38b6a264acb0f5ecbfc1a68e900cb0dd (patch) | |
tree | bc45fe62a79d344332af3c779fdf9555b9c633d2 /Master/texmf-dist/scripts | |
parent | 98f89874f52c2e28da43ff4b4583d1900dcbed31 (diff) |
tlcockpit (11jul19)
git-svn-id: svn://tug.org/texlive/trunk@51620 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-x | Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar | bin | 0 -> 16551953 bytes | |||
-rw-r--r-- | Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar | bin | 16591125 -> 55206148 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh | 10 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar b/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar Binary files differnew file mode 100755 index 00000000000..90b12ad2f47 --- /dev/null +++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar Binary files differindex 4ccd7cb962e..6a3f93fbebd 100644 --- a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar +++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh index 56333fb47b4..1b2e8d9cb04 100755 --- a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh +++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.sh @@ -1,8 +1,12 @@ -#!/bin/sh -# Public domain. Originally written by Norbert Preining and Karl Berry, 2018. +#!/bin/bash +# Public domain. Originally written by Norbert Preining and Karl Berry, 2018-2019. scriptname=`basename "$0"` -jar="$scriptname.jar" +javaVersion=$(java -version 2>&1 | head -1) +case "$javaVersion" in + *"1.8"*) jar="$scriptname-jdk8".jar ;; + *) jar="$scriptname.jar" ;; +esac jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"` kernel=`uname -s 2>/dev/null` |