[Pkg-owncloud-commits] [owncloud-client] 190/211: fix resources path and permissions

[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 2120ff8037ca4558c3183375c23074ca26cd61d3
Author: Craig Morrissey <craig at owncloud.com>
Date:   Thu Oct 23 16:36:15 2014 -0400

    fix resources path and permissions
---
 admin/osx/macdeployqt.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 278c666..5ffd002 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -250,8 +250,10 @@ def CopyFramework(path):
   parts = path.split(os.sep)
   print "CopyFramework:", path
   for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
+    matchObj = re.match(r'(\w+\.framework)', part)
+    if matchObj:
       full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      framework = matchObj.group(1)
       break
   args = ['mkdir', '-p', full_path]
   commands.append(args)
@@ -259,12 +261,13 @@ def CopyFramework(path):
   commands.append(args)
   args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
   commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(frameworks_dir, framework, "Resources")]
+  commands.append(args)
 
   info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
   if os.path.exists(info_plist):
-    args = ['cp', '-r', info_plist, resources_dir]
+    args = ['cp', '-r', info_plist, os.path.join(frameworks_dir, framework, "Resources")]
     commands.append(args)
-
   return os.path.join(full_path, parts[-1])
 
 def FixId(path, library_name):

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