Parcourir la source

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.
Markus Goetz il y a 9 ans
Parent
commit
6a9655aab6
2 fichiers modifiés avec 7 ajouts et 2 suppressions
  1. 3 1
      admin/osx/post_install.sh.cmake
  2. 4 1
      shell_integration/MacOSX/CMakeLists.txt

+ 3 - 1
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
+exit 0

+ 4 - 1
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)