From 8df3cbb4f3364c8711e2374b7fa5a42b2ce79b51 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Wed, 13 Aug 2025 18:20:41 +0300 Subject: [PATCH] Fix commercial macos build --- macos/fastlane/Fastfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/macos/fastlane/Fastfile b/macos/fastlane/Fastfile index ba773bb0b..f55c639a7 100644 --- a/macos/fastlane/Fastfile +++ b/macos/fastlane/Fastfile @@ -29,6 +29,7 @@ platform :mac do app_name = "ONLYOFFICE" app = "#{build}/#{app_name}.app" git_suffix = options[:git_suffix] + edition = options[:edition] desc 'Cleanup' sh("rm -rf ../#{build}") @@ -46,6 +47,9 @@ platform :mac do path: "ONLYOFFICE/Resources/#{scheme}/Info.plist", key: "ASCBundleBuildNumber" ) + package_name = app_name + if edition && !edition.empty? then package_name += "-#{edition}" end + package_name += "-#{git_suffix}-#{version_number}-#{app_build_number}" desc 'Build for developer id and notarize' gym( @@ -70,12 +74,7 @@ platform :mac do desc 'Create DMG image' sh("npm install appdmg") - sh("npx appdmg resources/appdmg.json ../#{build}/#{app_name}-#{git_suffix}-#{version_number}-#{app_build_number}.dmg") - # commercial - if scheme != "ONLYOFFICE-v8" - sh("find ../#{app} -name 'EULA.html' -exec cp -fv ../../common/package/license/commercial/LICENSE.html {} \\;") - sh("npx appdmg resources/appdmg.json ../#{build}/#{app_name}-Enterprise-#{git_suffix}-#{version_number}-#{app_build_number}.dmg") - end + sh("npx appdmg resources/appdmg.json ../#{build}/#{package_name}.dmg") if options[:skip_git_bump] next