OS X: Fix overlay installation on El Capitan #4650

The sleep is somehow needed, probably for pkg to rebuild its DB?
The case fix fixes a warning but did not fix the issue itself.

diff --git a/admin/osx/post_install.sh.cmake b/admin/osx/post_install.sh.cmake
index 3f2c49ae1477d4df0f8ab60efd4bfe8c07e4a0ac..bee2caaf928aae8f621276637791ea8d274cc186 100644 (file)
--- a/admin/osx/post_install.sh.cmake
+++ b/admin/osx/post_install.sh.cmake
@@ -12,8 +12,10 @@ EOF
 if [ -x "$(command -v pluginkit)" ]; then
     # add it to DB. This happens automatically too but we try to push it a bit harder for issue #3463
     pluginkit -a  "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/PlugIns/FinderSyncExt.appex/"
+    # Since El Capitan we need to sleep #4650
+    sleep 10s
     # enable it
     pluginkit -e use -i @APPLICATION_REV_DOMAIN@.FinderSyncExt
 fi
 
-exit 0
\ No newline at end of file
+exit 0

diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/CMakeLists.txt
index 83181d316e9af215643fa66c7f937d738a36e6ad..7461d6df732f1f4824b47829879a5ec4e6b25cd0 100644 (file)
--- a/shell_integration/MacOSX/CMakeLists.txt
+++ b/shell_integration/MacOSX/CMakeLists.txt
@@ -25,10 +25,13 @@ add_custom_target( mac_overlayplugin ALL
 add_dependencies(mac_overlayplugin ${APPLICATION_EXECUTABLE}) # for the ownCloud.icns to be generated
 
 
+# legacy
 INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/SyncStateFinder.osax/Contents
          DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/SyncStateFinder.osax/ )
+
+# >= 10.10.x
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/FinderSyncExt.appex
-    DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins
+    DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns
     USE_SOURCE_PERMISSIONS)
 endif(APPLE)