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)