Fix bug 64558 - Fix linux help package (#994)

ONLYOFFICE · Oct 10, 2023 · 2147fd6 · 2147fd6
1 parent 4308aa6
commit 2147fd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile
@@ -281,10 +281,10 @@ desktopeditor: branding $(LINUX_DEPS)
 	cp -rf ../../../common/package/mimetypes common/opt/desktopeditors
 
 ifeq ($(COMPANY_NAME), ONLYOFFICE)
-	for path in common documenteditor presentationeditor spreadsheeteditor; do \
-		mkdir -p common/help/desktopeditors/editors/web-apps/apps/$$path/main/resources; \
-		mv -ft common/help/desktopeditors/editors/web-apps/apps/$$path/main/resources \
-			common/opt/desktopeditors/editors/web-apps/apps/$$path/main/resources/help; \
+	for path in common/opt/desktopeditors/editors/web-apps/apps/*/main/resources/help; do \
+		path_new=$$(echo $$path | sed 's|/opt/|/help/|'); \
+		mkdir -p $$path_new; \
+		mv -fT $$path $$path_new; \
 	done
 endif
 

diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec
@@ -78,10 +78,7 @@ rm -rf "%{buildroot}"
 %attr(755, root, root) %{_bindir}/%{_desktopeditors_exec}
 %if "%{_company_name}" == "ONLYOFFICE"
 %attr(-, root, root) %{_bindir}/desktopeditors
-%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/common/main/resources/help
-%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/documenteditor/main/resources/help
-%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/presentationeditor/main/resources/help
-%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/spreadsheeteditor/main/resources/help
+%exclude /opt/%{_desktopeditors_prefix}/editors/web-apps/apps/*/main/resources/help
 %else
 %attr(755, root, root) %{_bindir}/%{_imageviewer_exec}
 %attr(755, root, root) %{_bindir}/%{_videoplayer_exec}
@@ -92,10 +89,7 @@ rm -rf "%{buildroot}"
 %if "%{_company_name}" == "ONLYOFFICE"
 %files help
 %defattr(-, root, root, -)
-/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/common/main/resources/help
-/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/documenteditor/main/resources/help
-/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/presentationeditor/main/resources/help
-/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/spreadsheeteditor/main/resources/help
+/opt/%{_desktopeditors_prefix}/editors/web-apps/apps/*/main/resources/help
 %endif
 
 %pre