Skip to content

Commit 424007b

Browse files
committed
macOS: change SOCKETAPI_TEAM_IDENTIFIER_PREFIX concatenation
Previously, the socket api prefix was created by concatenating SOCKETAPI_TEAM_IDENTIFIER_PREFIX and OC_APPLICATION_REV_DOMAIN together, so the first variable had to end in a "." to get the correct result. This change moves adding that period from configuration to the places where the concatenation happens.
1 parent 4a3fe9e commit 424007b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ option(BUILD_GUI "BUILD_GUI" ON)
131131
set(VIRTUAL_FILE_SYSTEM_PLUGINS suffix win CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins")
132132

133133
if(APPLE)
134-
set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
134+
set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (without a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
135135
endif()
136136

137137
if(BUILD_CLIENT)

shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSyncExt.entitlements

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<true/>
77
<key>com.apple.security.application-groups</key>
88
<array>
9-
<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX)$(OC_APPLICATION_REV_DOMAIN)</string>
9+
<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX).$(OC_APPLICATION_REV_DOMAIN)</string>
1010
</array>
1111
</dict>
1212
</plist>

shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>SocketApiPrefix</key>
6-
<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX)$(OC_APPLICATION_REV_DOMAIN)</string>
6+
<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX).$(OC_APPLICATION_REV_DOMAIN)</string>
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleDisplayName</key>

src/gui/socketapi/socketapi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ SocketApi::SocketApi(QObject *parent)
232232
// This must match the code signing Team setting of the extension
233233
// Example for developer builds (with ad-hoc signing identity): "" "com.owncloud.desktopclient" ".socketApi"
234234
// Example for official signed packages: "9B5WD74GWJ." "com.owncloud.desktopclient" ".socketApi"
235-
socketPath = SOCKETAPI_TEAM_IDENTIFIER_PREFIX APPLICATION_REV_DOMAIN ".socketApi";
235+
socketPath = SOCKETAPI_TEAM_IDENTIFIER_PREFIX "." APPLICATION_REV_DOMAIN ".socketApi";
236236
#ifdef Q_OS_MAC
237237
CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
238238
QString bundlePath = QUrl::fromCFURL(url).path();

0 commit comments

Comments
 (0)