Sparkle

Merge lp:~stuart-morgan/sparkle/loc-link-fix into lp:sparkle

  1. loc-link-fix
  2. Merge into main
Proposed by Stuart Morgan
Status: Merged
Merged at revision: 349
Proposed branch: lp:~stuart-morgan/sparkle/loc-link-fix
Merge into: lp:sparkle
Diff against target: None lines
To merge this branch: bzr merge lp:~stuart-morgan/sparkle/loc-link-fix
Reviewer Review Type Date Requested Status
Andy Matuschak Approve
Review via email: mp+6736@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stuart Morgan (stuart-morgan) wrote :

The current script behaves incorrectly when run multiple times: the second time it will make a nested link (it will resolve the fr_CA link to the fr directory, and make an fr link inside it that points to the outer fr), and after that it will log errors because the target already exists. This change adds flags so that the existing link will be silently replaced, without resolving it.

Revision history for this message
Andy Matuschak (andymatuschak) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Sparkle.xcodeproj/project.pbxproj'
2--- Sparkle.xcodeproj/project.pbxproj 2009-05-08 16:26:46 +0000
3+++ Sparkle.xcodeproj/project.pbxproj 2009-05-22 04:02:35 +0000
4@@ -818,7 +818,7 @@
5 );
6 runOnlyForDeploymentPostprocessing = 0;
7 shellPath = "/usr/bin/env ruby";
8- shellScript = "resources = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"WRAPPER_NAME\"]}/Resources\"\n`ln -s \"fr.lproj\" \"#{resources}/fr_CA.lproj\"`";
9+ shellScript = "resources = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"WRAPPER_NAME\"]}/Resources\"\n`ln -sfh \"fr.lproj\" \"#{resources}/fr_CA.lproj\"`";
10 };
11 /* End PBXShellScriptBuildPhase section */
12

Subscribers

People subscribed via source and target branches