mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-16 19:50:19 +01:00
system/apache-tomcat: Fix location of tomcat-juli.jar.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
cb0b8510e6
commit
342a00436d
2 changed files with 4 additions and 4 deletions
|
@ -26,7 +26,7 @@
|
|||
PRGNAM=apache-tomcat
|
||||
VERSION=7.0.47
|
||||
ARCH=noarch
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
CWD=$(pwd)
|
||||
|
@ -68,14 +68,13 @@ mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \
|
|||
|
||||
rm -f bin/*.exe bin/*.bat bin/*.tar.gz bin/commons-daemon.jar
|
||||
cp -rf bin lib $PKG/usr/share/tomcat/
|
||||
mv $PKG/usr/share/tomcat/bin/tomcat-juli.jar \
|
||||
$PKG/usr/share/tomcat/lib/
|
||||
|
||||
cp -f conf/* $PKG/etc/tomcat/
|
||||
cp -f $CWD/tomcat-java.conf $PKG/etc/tomcat/tomcat-java.conf
|
||||
|
||||
cp -rf webapps ${PKG}${TOMCAT_HOME}/webapps
|
||||
|
||||
ln -s /usr/share/tomcat/bin ${PKG}${TOMCAT_HOME}/bin
|
||||
ln -s /var/log/tomcat ${PKG}${TOMCAT_HOME}/logs
|
||||
ln -s /var/tmp/tomcat ${PKG}${TOMCAT_HOME}/temp
|
||||
ln -s /var/run/tomcat ${PKG}${TOMCAT_HOME}/work
|
||||
|
|
|
@ -18,7 +18,8 @@ fi
|
|||
PIDFILE="/var/spool/tomcat/tomcat.pid"
|
||||
LOGFILE="/var/log/tomcat/tomcat.log"
|
||||
|
||||
CLASSPATH="$CATALINA_BASE/bin/bootstrap.jar:/usr/share/java/commons-daemon.jar"
|
||||
CLASSPATH="$CATALINA_BASE/bin/bootstrap.jar:$CATALINA_BASE/bin/tomcat-juli.jar"
|
||||
CLASSPATH="$CLASSPATH:/usr/share/java/commons-daemon.jar"
|
||||
for i in $CATALINA_LIBDIR/*.jar; do
|
||||
CLASSPATH=$CLASSPATH:$i
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue