pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge hotfix/v7.3.3 into release/v7.4.0

Browse Source 
Merge branch hotfix/v7.3.3 into release/v7.4.0
This commit is contained in:
Alexey Golubev
2023-04-28 18:14:22 +05:00
committed by GitHub
parent f9e2c3b239 f33966bb94
commit dbcf1a61a2
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
win-linux/package/linux/deb/template/postinst.m4
View File

@ -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

16
win-linux/package/linux/deb/template/postrm.m4
View File

@ -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)
:
;;
*)