[Pkg-owncloud-commits] [owncloud-client] 344/470: OS X: Fix overlay installation on El Capitan #4650

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 6a9655aab6b0b06dc4085dcb01ff7ef4131100ee
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Apr 15 16:56:54 2016 +0200

    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.
---
 admin/osx/post_install.sh.cmake         | 4 +++-
 shell_integration/MacOSX/CMakeLists.txt | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/osx/post_install.sh.cmake b/admin/osx/post_install.sh.cmake
index 3f2c49a..bee2caa 100644
--- 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 at .app/Contents/PlugIns/FinderSyncExt.appex/"
+    # Since El Capitan we need to sleep #4650
+    sleep 10s
     # enable it
     pluginkit -e use -i @APPLICATION_REV_DOMAIN at .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 83181d3..7461d6d 100644
--- 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)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git