git.iko.soy/bat
on master help sign in
Revert changing generated file names based on parameters

It should be handled by a packaging script, not a build script.

commitf09b75dafa1481a19e3d3a28c2a8238cd797e57b authorEthan P <eth-p+git@hidden.email> dateFri 27 Sep 2019, 12:34 (7 years ago) parent54ec2e7
2 files changed+6−15
compare with master
unifiedsplit
build.rs+2−7 ci/before_deploy.bash+4−8
build.rs+2−7
@@ -55,16 +55,11 @@ fn template(
5555fn main() -> Result<(), Box<dyn Error>> {
5656 let variables = init_template();
5757
58− template(
59− &variables,
60− "assets/manual/bat.1.in",
61− &format!("assets/manual/{}.1", EXECUTABLE_NAME.to_owned()),
62− )?;
63−
58+ template(&variables, "assets/manual/bat.1.in", "assets/manual/bat.1")?;
6459 template(
6560 &variables,
6661 "assets/completions/bat.fish.in",
67− &format!("assets/completions/{}.fish", EXECUTABLE_NAME.to_owned()),
62+ "assets/completions/bat.fish",
6863 )?;
6964
7065 Ok(())
ci/before_deploy.bash+4−8
@@ -7,10 +7,6 @@ if [[ -z "$PROJECT_NAME" ]]; then
77 export PROJECT_NAME="bat"
88fi
99
10−if [[ -z "$PROJECT_EXECUTABLE" ]]; then
11− export PROJECT_EXECUTABLE="$PROJECT_NAME"
12−fi
13−
1410build() {
1511 cargo build --target "$TARGET" --release --verbose
1612}
@@ -42,7 +38,7 @@ pack() {
4238 "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
4339
4440 # manpage, readme and license
45− cp "assets/manual/$PROJECT_EXECUTABLE.1" "$tempdir/$package_name"
41+ cp "assets/manual/bat.1" "$tempdir/$package_name/$PROJECT_NAME.1"
4642 cp README.md "$tempdir/$package_name"
4743 cp LICENSE-MIT "$tempdir/$package_name"
4844 cp LICENSE-APACHE "$tempdir/$package_name"
@@ -51,7 +47,7 @@ pack() {
5147 # TODO: disabled for now, see issue #372
5248 # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".bash "$tempdir/$package_name/autocomplete/${PROJECT_NAME}.bash-completion"
5349 # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".fish "$tempdir/$package_name/autocomplete"
54− cp "assets/completions/$PROJECT_EXECUTABLE.fish" "$tempdir/$package_name/autocomplete"
50+ cp "assets/completions/bat.fish" "$tempdir/$package_name/autocomplete/$PROJECT_NAME.fish"
5551 # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/_"$PROJECT_NAME" "$tempdir/$package_name/autocomplete"
5652
5753 # archiving
@@ -112,11 +108,11 @@ make_deb() {
112108 "${gcc_prefix}"strip "$tempdir/usr/bin/$PROJECT_NAME"
113109
114110 # manpage
115− install -Dm644 "assets/manual/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
111+ install -Dm644 "assets/manual/bat.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
116112 gzip --best "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
117113
118114 # completions
119− install -Dm644 "assets/completions/$PROJECT_EXECUTABLE.fish" "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
115+ install -Dm644 "assets/completions/bat.fish" "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
120116
121117 # readme and license
122118 install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md"