summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/tlcockpit
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-11 21:18:13 +0000
committerKarl Berry <karl@freefriends.org>2019-07-11 21:18:13 +0000
commitd9fdc45f38b6a264acb0f5ecbfc1a68e900cb0dd (patch)
treebc45fe62a79d344332af3c779fdf9555b9c633d2 /Master/texmf-dist/scripts/tlcockpit
parent98f89874f52c2e28da43ff4b4583d1900dcbed31 (diff)
tlcockpit (11jul19)
git-svn-id: svn://tug.org/texlive/trunk@51620 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/tlcockpit')
-rwxr-xr-xMaster/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jarbin0 -> 16551953 bytes
-rw-r--r--Master/texmf-dist/scripts/tlcockpit/tlcockpit.jarbin16591125 -> 55206148 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/tlcockpit/tlcockpit.sh10
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
new file mode 100755
index 00000000000..90b12ad2f47
--- /dev/null
+++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit-jdk8.jar
Binary files differ
diff --git a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar
index 4ccd7cb962e..6a3f93fbebd 100644
--- a/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar
+++ b/Master/texmf-dist/scripts/tlcockpit/tlcockpit.jar
Binary files differ
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`