32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
commit 2672a0f30c3cbd5ad8a28761dcd837498353d7e5
|
|
Author: Alex Kirhenshtein <alk@netxms.org>
|
|
Date: Wed May 5 19:53:12 2021 +0300
|
|
|
|
nxreportd wrapper now works correctly with Debian's multiarch
|
|
|
|
diff --git a/src/server/nxreportd/nxreportd.in b/src/server/nxreportd/nxreportd.in
|
|
index d7eaac3095..c7ff0c9672 100644
|
|
--- a/src/server/nxreportd/nxreportd.in
|
|
+++ b/src/server/nxreportd/nxreportd.in
|
|
@@ -16,6 +16,11 @@ else
|
|
fi
|
|
|
|
###############################################################################
|
|
+NXREPORTD_JAR_FILE=~PKGLIBDIR~/java/nxreportd-~PACKAGE_VERSION~.jar
|
|
+if [ ! -r $NXREPORTD_JAR_FILE ]; then
|
|
+ NXREPORTD_JAR_FILE=$NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar
|
|
+fi
|
|
+
|
|
show_usage_and_exit() {
|
|
cat <<END
|
|
NetXMS Reporting Server
|
|
@@ -93,7 +98,7 @@ if [ -z $JAVA ]; then
|
|
fi
|
|
|
|
if [ "x$DAEMON" = "xyes" ]; then
|
|
- nohup $JAVA $JAVA_OPTIONS -jar $NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar >/dev/null 2>/dev/null &
|
|
+ nohup $JAVA $JAVA_OPTIONS -jar $NXREPORTD_JAR_FILE >/dev/null 2>/dev/null &
|
|
else
|
|
- $JAVA $JAVA_OPTIONS -jar $NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar
|
|
+ $JAVA $JAVA_OPTIONS -jar $NXREPORTD_JAR_FILE
|
|
fi
|