From db2ed3a55582f13dffe04e796440a98890fd7e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com> Date: Wed, 25 Aug 2021 15:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E7=89=88?= =?UTF-8?q?=E6=9C=ACLibreOffice=E6=9C=AC=E5=9C=B0=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BD=86=E6=A3=80=E6=B5=8B=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/artofsolving/jodconverter/office/OfficeUtils.java | 5 +++++ server/src/main/bin/install.sh | 2 +- server/src/main/bin/startup.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java b/office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java index 82738105..d155a2a1 100644 --- a/office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java +++ b/office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java @@ -104,9 +104,14 @@ public class OfficeUtils { "/opt/openoffice.org3", "/opt/openoffice", "/opt/libreoffice", + "/opt/libreoffice6.0", "/opt/libreoffice6.1", + "/opt/libreoffice6.2", + "/opt/libreoffice6.3", + "/opt/libreoffice6.4", "/opt/libreoffice7.0", "/opt/libreoffice7.1", + "/opt/libreoffice7.2", "/opt/openoffice4", "/usr/lib/openoffice", "/usr/lib/libreoffice" diff --git a/server/src/main/bin/install.sh b/server/src/main/bin/install.sh index 36f88905..9b35a762 100644 --- a/server/src/main/bin/install.sh +++ b/server/src/main/bin/install.sh @@ -7,7 +7,7 @@ install_redhat() { if [ $? -eq 0 ];then yum install -y libXext.x86_64 yum groupinstall -y "X Window System" - yum installlocalho + yum localinstall *.rpm echo 'install finshed...' else echo 'download package error...' diff --git a/server/src/main/bin/startup.sh b/server/src/main/bin/startup.sh index e4e9d6dc..99ad8f23 100644 --- a/server/src/main/bin/startup.sh +++ b/server/src/main/bin/startup.sh @@ -1,5 +1,5 @@ #!/bin/bash -DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/libreoffice6.1" "/opt/libreoffice7.0" "/opt/libreoffice7.1" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice" "/usr/lib64/libreoffice") +DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/libreoffice6.0" "/opt/libreoffice6.1" "/opt/libreoffice6.2" "/opt/libreoffice6.3" "/opt/libreoffice6.4" "/opt/libreoffice7.0" "/opt/libreoffice7.1" "/opt/libreoffice7.2" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice" "/usr/lib64/libreoffice") FLAG= OFFICE_HOME= KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")";pwd)