diff options
author | Cameron Katri <me@cameronkatri.com> | 2022-03-20 13:00:10 -0400 |
---|---|---|
committer | Cameron Katri <me@cameronkatri.com> | 2022-03-20 13:00:10 -0400 |
commit | 074e13ac687246497ec79383992d43d4361a018a (patch) | |
tree | 7fc89d0415755433f88035ec477e0e6ca4ae439a | |
parent | dbcc6b36c6287cdae899ecdb3fb858038a93986d (diff) | |
parent | 6f0efaf1f0710f5f1d29c3b050d8a5362023bd81 (diff) | |
download | ldid-074e13ac687246497ec79383992d43d4361a018a.tar.gz ldid-074e13ac687246497ec79383992d43d4361a018a.tar.zst ldid-074e13ac687246497ec79383992d43d4361a018a.zip |
Merge branch 'saurik'
-rw-r--r-- | ldid.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -2803,7 +2803,7 @@ struct State { } }; -Bundle Sign(const std::string &root, Folder &parent, const std::string &key, State &remote, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress) { +Bundle Sign(const std::string &root, Folder &parent, const std::string &key, State &local, const std::string &requirements, const Functor<std::string (const std::string &, const std::string &)> &alter, const Progress &progress) { std::string executable; std::string identifier; @@ -2882,8 +2882,6 @@ Bundle Sign(const std::string &root, Folder &parent, const std::string &key, Sta rules2.insert(Rule{20, NoMode, "^version\\.plist$"}); } - State local; - std::string failure(mac ? "Contents/|Versions/[^/]*/Resources/" : ""); Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$"); std::map<std::string, Bundle> bundles; @@ -2891,16 +2889,18 @@ Bundle Sign(const std::string &root, Folder &parent, const std::string &key, Sta folder.Find("", fun([&](const std::string &name) { if (!nested(name)) return; - auto bundle(root + Split(name).dir); + auto bundle(Split(name).dir); if (mac) { _assert(!bundle.empty()); bundle = Split(bundle.substr(0, bundle.size() - 1)).dir; } SubFolder subfolder(folder, bundle); - bundles[nested[1]] = Sign(bundle, subfolder, key, local, "", Starts(name, "PlugIns/") ? alter : + State remote; + bundles[nested[1]] = Sign(root + bundle, subfolder, key, remote, "", Starts(name, "PlugIns/") ? alter : static_cast<const Functor<std::string (const std::string &, const std::string &)> &>(fun([&](const std::string &, const std::string &) -> std::string { return entitlements; })) , progress); + local.Merge(bundle, remote); }), fun([&](const std::string &name, const Functor<std::string ()> &read) { })); @@ -3087,7 +3087,6 @@ Bundle Sign(const std::string &root, Folder &parent, const std::string &key, Sta })); })); - remote.Merge(root, local); return bundle; } |