From aa738cf17a1d5778f71ff68a89388715b03d5d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Thu, 16 Apr 2020 11:04:01 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1029
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 utils/deploy_tool/main.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp
index 70085535..2f90299b 100644
--- a/utils/deploy_tool/main.cpp
+++ b/utils/deploy_tool/main.cpp
@@ -372,17 +372,20 @@ void patchNameTool() {
 		cmd = otool + " -L \"" + ll;
 		cmd += "\" | grep -o \".*(\"";
 		dlibs = execute(cmd).split("\n");
-		PICout(DefaultControls) << "patch" << ll;// << dlibs;
+		if (!dlibs.isEmpty()) {
+			execute("chmod +w \"" + ll + "\"");
+		}
+		PICout(DefaultControls) << "patch" << ll;
 		piForeach (PIString dl, dlibs) {
 			dl.cutRight(1).trim();
 			PIFile::FileInfo fi2;
 			fi2.path = dl;
-			dl = findLib(fi2.name());
-			PICout(DefaultControls) << "  depend on" << dl << "...";
-			if (!all_libs.contains(dl)) continue;
+			PIString fl = findLib(fi2.name());
+			PICout(DefaultControls) << "  depend on" << fl << "...";
+			if (!all_libs.contains(fl)) continue;
 			PICout(DefaultControls) << "  yes";
-			cmd = nametool + " -change \"" + l + "\"";
-			cmd += " \"@executable_path/../Frameworks/" + fi.name() + "\"";
+			cmd = nametool + " -change \"" + dl + "\"";
+			cmd += " \"@executable_path/../Frameworks/" + fi2.name() + "\"";
 			cmd += " \"" + ll + "\"";
 			PICout(DefaultControls) << cmd;
 			execute(cmd);