diff --git a/win-linux/package/linux/deb/template/postinst.m4 b/win-linux/package/linux/deb/template/postinst.m4 index 340624f4d..b64430dc5 100644 --- a/win-linux/package/linux/deb/template/postinst.m4 +++ b/win-linux/package/linux/deb/template/postinst.m4 @@ -34,8 +34,13 @@ if [ $(cat "$MIMEAPPS_LIST" | grep text/oform | wc -l) -eq "0" ]; then echo "text/oform=M4_DESKTOPEDITORS_EXEC.desktop" >>"$MIMEAPPS_LIST" fi +ifelse(M4_COMPANY_NAME, ONLYOFFICE, xdg-mime install --mode system /opt/M4_DESKTOPEDITORS_PREFIX/mimetypes/onlyoffice-docxf.xml -xdg-mime install --mode system /opt/M4_DESKTOPEDITORS_PREFIX/mimetypes/onlyoffice-oform.xml +xdg-mime install --mode system /opt/M4_DESKTOPEDITORS_PREFIX/mimetypes/onlyoffice-oform.xml, +if [ -f /etc/astra_version ] && [ -f /etc/X11/trusted ]; then + sed -i '\|/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors|d' /etc/X11/trusted + echo '/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors(KBD_R)' >> /etc/X11/trusted +fi) # Update cache of .desktop file MIME types. Non-fatal since it's just a cache. #update-desktop-database > /dev/null 2>&1 || true diff --git a/win-linux/package/linux/deb/template/postrm.m4 b/win-linux/package/linux/deb/template/postrm.m4 index fc4471219..f27e145bb 100644 --- a/win-linux/package/linux/deb/template/postrm.m4 +++ b/win-linux/package/linux/deb/template/postrm.m4 @@ -7,11 +7,21 @@ case "$1" in purge) ifelse(M4_COMPANY_NAME, ONLYOFFICE, rm -fr /home/*/.local/share/M4_DESKTOPEDITORS_PREFIX, - rm -fr /home/*/.local/share/M4_PACKAGE_NAME) + rm -fr /home/*/.local/share/M4_PACKAGE_NAME + if [ -f /etc/astra_version ] && [ -f /etc/X11/trusted ]; then + sed -i '\|/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors|d' /etc/X11/trusted + fi) ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - : + remove) + ifelse(M4_COMPANY_NAME, ONLYOFFICE,:, + if [ -f /etc/astra_version ] && [ -f /etc/X11/trusted ]; then + sed -i '\|/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors|d' /etc/X11/trusted + fi) + ;; + + upgrade|failed-upgrade|disappear|abort-install|abort-upgrade) + : ;; *)