aboutsummaryrefslogtreecommitdiffstats
path: root/components/util/resource_files.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-15 10:29:55 -0700
committerGitHub <noreply@github.com>2016-07-15 10:29:55 -0700
commit175340d1461c3474b49f88131b84298b8d097d36 (patch)
treea011eb38fb702c0bc45dc4424701f29d7345d7b1 /components/util/resource_files.rs
parent6640115c9775e7177f79b1d6aa5fddceeeeb22e2 (diff)
parent292a5e90e0c2079f982b54bbe8bfc941a5192986 (diff)
downloadservo-175340d1461c3474b49f88131b84298b8d097d36.tar.gz
servo-175340d1461c3474b49f88131b84298b8d097d36.zip
Auto merge of #12137 - ConnorGBrewster:resources_case_sensitive, r=aneeshusa
Check for Resources on case sensitive filesystem <!-- Please describe your changes on the following line: --> Case where this is needed: http://logs.glob.uno/?c=mozilla%23servo&s=1+Jul+2016&e=1+Jul+2016#c471192 Another option is to make the Resources folder on the mac .app bundle be lower case; however, it is standard to have `Resources` in a .app bundle. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12137) <!-- Reviewable:end -->
Diffstat (limited to 'components/util/resource_files.rs')
-rw-r--r--components/util/resource_files.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/components/util/resource_files.rs b/components/util/resource_files.rs
index d580b6f8a1e..9c2eab83df6 100644
--- a/components/util/resource_files.rs
+++ b/components/util/resource_files.rs
@@ -46,6 +46,12 @@ pub fn resources_dir_path() -> PathBuf {
break;
}
path.pop();
+ // Check for Resources on mac when using a case sensitive filesystem.
+ path.push("Resources");
+ if path.is_dir() {
+ break;
+ }
+ path.pop();
}
*dir = Some(path.to_str().unwrap().to_owned());
path