Skip to content

Commit 4955eb4

Browse files
authored
Merge pull request #10699 from nextcloud/bugfix/noid/overwritelegacyclient
fix(cmake): set cmake var APPLICATION_REV_DOMAIN_INSTALLER
2 parents 303fc3b + 6907af3 commit 4955eb4

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX)
5656
endif()
5757

5858
# need this logic to not mess with re/uninstallations via macosx.pkgproj
59-
if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
60-
set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")
61-
else()
62-
set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
59+
if(NOT DEFINED APPLICATION_REV_DOMAIN_INSTALLER)
60+
set(APPLICATION_REV_DOMAIN_INSTALLER "${APPLICATION_REV_DOMAIN}")
6361
endif()
6462

6563
option( APPLICATION_DISPLAY_LEGACY_IMPORT_DIALOG "Display legacy import dialog" ON )

admin/osx/macosx.pkgproj.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<key>CHILDREN</key>
1818
<array>
1919
<dict>
20+
<key>BUNDLE_CAN_DOWNGRADE</key>
21+
<true/>
2022
<key>CHILDREN</key>
2123
<array/>
2224
<key>GID</key>

0 commit comments

Comments
 (0)