Fix completion build.rs

This commit is contained in:
Andrew Gallant 2016-12-07 10:32:24 -05:00
parent 30db03bb62
commit 3f515afbb4
2 changed files with 12 additions and 8 deletions

View File

@ -3,6 +3,7 @@ extern crate clap;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
use std::env;
use std::fs; use std::fs;
use clap::Shell; use clap::Shell;
@ -12,12 +13,15 @@ use clap::Shell;
mod app; mod app;
fn main() { fn main() {
fs::create_dir_all(env!("OUT_DIR")).unwrap(); let outdir = match env::var_os("OUT_DIR") {
None => return,
Some(outdir) => outdir,
};
fs::create_dir_all(&outdir).unwrap();
let mut app = app::app_short(); let mut app = app::app_short();
app.gen_completions("rg", Shell::Bash, env!("OUT_DIR")); app.gen_completions("rg", Shell::Bash, &outdir);
app.gen_completions("rg", Shell::Fish, env!("OUT_DIR")); app.gen_completions("rg", Shell::Fish, &outdir);
// Zsh seems to fail with a panic. app.gen_completions("rg", Shell::Zsh, &outdir);
// app.gen_completions("rg", Shell::Zsh, env!("OUT_DIR")); app.gen_completions("rg", Shell::PowerShell, &outdir);
app.gen_completions("rg", Shell::PowerShell, env!("OUT_DIR"));
} }

View File

@ -16,11 +16,11 @@ mk_tarball() {
local out_dir=$(pwd) local out_dir=$(pwd)
local name="${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}" local name="${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}"
mkdir "$td/$name" mkdir "$td/$name"
mkdir "$td/$name/complete"
cp target/$TARGET/release/rg "$td/$name/" cp target/$TARGET/release/rg "$td/$name/"
cp {doc/rg.1,README.md,UNLICENSE,COPYING,LICENSE-MIT} "$td/$name/" cp {doc/rg.1,README.md,UNLICENSE,COPYING,LICENSE-MIT} "$td/$name/"
cp target/release/build/ripgrep-*/out/rg.* "$td/$name/" cp target/release/build/ripgrep-*/out/{_rg,rg.bash-completion,rg.fish,_rg.ps1} "$td/$name/complete/"
cp target/release/build/ripgrep-*/out/_rg.* "$td/$name/"
pushd $td pushd $td
tar czf "$out_dir/$name.tar.gz" * tar czf "$out_dir/$name.tar.gz" *