Explicitly set bundle name and identifiers from env vars in FileProviderUIExt

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist
index f559d75c46ab4e2b81ead16f90ec682074225355..85f108b15fc9600363f5398ea8ec4e7e20633211 100644 (file)
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist
@@ -2,6 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>CFBundleName</key>
+    <string>$(PRODUCT_NAME)</string>
+    <key>CFBundleDisplayName</key>
+    <string>$(OC_APPLICATION_NAME) File Provider UI Extension</string>
+    <key>CFBundleIdentifier</key>
+    <string>$(OC_APPLICATION_REV_DOMAIN).$(PRODUCT_NAME)</string>
        <key>NSExtension</key>
        <dict>
                <key>NSExtensionFileProviderActions</key>
@@ -15,10 +21,10 @@
                                <string>Share options</string>
                        </dict>
                </array>
-               <key>NSExtensionPrincipalClass</key>
-               <string>$(PRODUCT_MODULE_NAME).DocumentActionViewController</string>
                <key>NSExtensionPointIdentifier</key>
                <string>com.apple.fileprovider-actionsui</string>
+               <key>NSExtensionPrincipalClass</key>
+               <string>$(PRODUCT_MODULE_NAME).DocumentActionViewController</string>
        </dict>
 </dict>
 </plist>

diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
index d5bed2cee8d4394db575cfbe56134983902808df..aadb372da676acf4add5bc715828855f05a713fc 100644 (file)
--- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
@@ -1021,7 +1021,6 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GENERATE_INFOPLIST_FILE = YES;
                                INFOPLIST_FILE = FileProviderUIExt/Info.plist;
-                               INFOPLIST_KEY_CFBundleDisplayName = FileProviderUIExt;
                                INFOPLIST_KEY_NSHumanReadableCopyright = "";
                                INFOPLIST_OUTPUT_FORMAT = "same-as-input";
                                INFOPLIST_PREPROCESS = NO;
@@ -1082,7 +1081,6 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GENERATE_INFOPLIST_FILE = YES;
                                INFOPLIST_FILE = FileProviderUIExt/Info.plist;
-                               INFOPLIST_KEY_CFBundleDisplayName = FileProviderUIExt;
                                INFOPLIST_KEY_NSHumanReadableCopyright = "";
                                INFOPLIST_OUTPUT_FORMAT = "same-as-input";
                                INFOPLIST_PREPROCESS = NO;