From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Fri, 22 Jan 2016 17:03:18 +0000 (+0100)
Subject: OS X: Fix macdeployqt not to embed symlinks when ran multiple times
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1254^2~39
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=509224308075eedd2b988d52af92f85e32d3cb54;p=nextcloud-desktop.git

OS X: Fix macdeployqt not to embed symlinks when ran multiple times

ln has a special syntax to create the symlink inside the last path if it's
a directory (or a symlink to a directory).

Also pass --strict to codesign --verify to catch this kind of error.
---

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 8c6002244..25bfaeb2c 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -261,6 +261,9 @@ def CopyFramework(source_dylib):
       dest_path = os.path.join(frameworks_dir, framework)
       dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
       break
+  if os.path.exists(dest_path):
+    print dest_path, "already exists, skipping..."
+    return
 
   args = ['mkdir', '-p', dest_dylib_path]
   commands.append(args)
diff --git a/admin/osx/sign_app.sh b/admin/osx/sign_app.sh
index e495fe105..355b8d28a 100755
--- a/admin/osx/sign_app.sh
+++ b/admin/osx/sign_app.sh
@@ -10,7 +10,7 @@ codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --d
 
 # Verify the signature
 codesign -dv $src_app
-codesign --verify -v $src_app
+codesign --verify -v --strict $src_app
 spctl -a -t exec -vv $src_app
 
 # Validate that the key used for signing the binary matches the expected TeamIdentifier