diff options
Diffstat (limited to 'system/apache-tomcat')
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.info | 2 | ||||
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info index 66f3a4bc0d975..fd8bc56c655ce 100644 --- a/system/apache-tomcat/apache-tomcat.info +++ b/system/apache-tomcat/apache-tomcat.info @@ -5,6 +5,6 @@ DOWNLOAD="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-1 MD5SUM="61e57ae161ab3cea28ca157b57fe8b77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk commons-daemon" +REQUIRES="zulu-openjdk8 commons-daemon" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat index 3e2c307bf7851..e3630784a1a55 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -9,10 +9,14 @@ # Load environment variables . /etc/profile.d/apache-tomcat.sh -if [ -e "/etc/profile.d/openjdk.sh" ]; then - . /etc/profile.d/openjdk.sh -else - . /etc/profile.d/jdk.sh + +if [ -z "$JAVA_HOME" ]; then + for i in /etc/profile.d/*jdk*.sh; do + if [ -x $i ]; then + source $i + break + fi + done fi PIDFILE="/var/spool/tomcat/tomcat.pid" |