about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-17 12:50:14 +0000
committerbors <bors@rust-lang.org>2017-05-17 12:50:14 +0000
commit2b6ed3a05149325448a42a119a3174093caa41f3 (patch)
treeb11f74af85a694361c11aa8cf4fcde74eafbe0f3 /src
parent208d23a9966a91318e59b474eb2fe7e1891a590a (diff)
parentdda2d756facc1c8100261e2ebd4e115c84f515cc (diff)
Auto merge of #42041 - Keruspe:master, r=alexcrichton
rustbuild: fix bash completion installation dir
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/dist.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 6557b8410b1..511f2c9e80e 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -596,7 +596,7 @@ pub fn cargo(build: &Build, stage: u32, target: &str) {
 
     // Prepare the image directory
     t!(fs::create_dir_all(image.join("share/zsh/site-functions")));
-    t!(fs::create_dir_all(image.join("etc/bash_completions.d")));
+    t!(fs::create_dir_all(image.join("etc/bash_completion.d")));
     let cargo = build.cargo_out(&compiler, Mode::Tool, target)
                      .join(exe("cargo", target));
     install(&cargo, &image.join("bin"), 0o755);
@@ -606,7 +606,7 @@ pub fn cargo(build: &Build, stage: u32, target: &str) {
     }
     install(&etc.join("_cargo"), &image.join("share/zsh/site-functions"), 0o644);
     copy(&etc.join("cargo.bashcomp.sh"),
-         &image.join("etc/bash_completions.d/cargo"));
+         &image.join("etc/bash_completion.d/cargo"));
     let doc = image.join("share/doc/cargo");
     install(&src.join("README.md"), &doc, 0o644);
     install(&src.join("LICENSE-MIT"), &doc, 0o644);