pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 77116 - Fix mac license (#471)

Browse Source 
Co-authored-by: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
Co-committed-by: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
This commit is contained in:
Semyon Bezrukov
2025-10-02 12:16:10 +00:00
committed by Alexey Golubev
parent 80b16ff291
commit 8be8365d60
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
common/package/license/opensource/EULA.html → common/package/license/opensource/LICENSE.html
View File

2
macos/ONLYOFFICE/Code/Controllers/About/ASCAboutController.m
View File

@ -102,7 +102,7 @@
// EULA View
if (self.eulaWebView) {
if ( !eulaUrl )
eulaUrl = [[NSBundle mainBundle] URLForResource:@"License" withExtension:@"html" subdirectory:@"license"];
eulaUrl = [[NSBundle mainBundle] URLForResource:@"LICENSE" withExtension:@"html" subdirectory:@"license"];
[[self.eulaWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:eulaUrl]];
} else {
// About View

9
macos/fastlane/Fastfile
View File

@ -32,7 +32,7 @@ platform :mac do
edition = options[:edition]
desc 'Cleanup'
sh("rm -rf ../#{build}")
sh("rm -rf ../#{build} && rm -rf ../Vendor/ONLYOFFICE")
desc 'Get the version from plist'
version_number = get_info_plist_value(
@ -51,9 +51,10 @@ platform :mac do
if edition && !edition.empty? then package_name += "-#{edition}" end
package_name += "-#{git_suffix}-#{version_number}-#{app_build_number}"
if edition == "Enterprise"
sh("rm -fv ../Vendor/ONLYOFFICE/license/EULA.html")
sh("cp -fv ../../common/package/license/commercial/LICENSE.html ../Vendor/ONLYOFFICE/license/")
if edition != "Enterprise"
sh("mkdir -p ../Vendor/ONLYOFFICE/license && cp -fv ../../common/package/license/opensource/LICENSE.html ../Vendor/ONLYOFFICE/license/LICENSE.html")
else
sh("mkdir -p ../Vendor/ONLYOFFICE/license && cp -fv ../../common/package/license/commercial/LICENSE.html ../Vendor/ONLYOFFICE/license/EULA.html")
end
desc 'Build for developer id and notarize'