From 54ec2e7bd05da6390dd9ea4c6b4c716cbbb3ec40 Mon Sep 17 00:00:00 2001
From: Ethan P <eth-p+git@hidden.email>
Date: Fri, 27 Sep 2019 12:29:22 -0700
Subject: [PATCH] Fix CI before_deploy to use parameterized names

---
 ci/before_deploy.bash | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ci/before_deploy.bash b/ci/before_deploy.bash
index 945bbfe3..1d5069e4 100755
--- a/ci/before_deploy.bash
+++ b/ci/before_deploy.bash
@@ -1,8 +1,16 @@
 #!/usr/bin/env bash
 # Building and packaging for release
-
 set -ex
 
+# Ensure environment variables exist.
+if [[ -z "$PROJECT_NAME" ]]; then
+    export PROJECT_NAME="bat"
+fi
+
+if [[ -z "$PROJECT_EXECUTABLE" ]]; then
+    export PROJECT_EXECUTABLE="$PROJECT_NAME"
+fi
+
 build() {
     cargo build --target "$TARGET" --release --verbose
 }
@@ -34,7 +42,7 @@ pack() {
     "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
 
     # manpage, readme and license
-    cp "assets/manual/$PROJECT_NAME.1" "$tempdir/$package_name"
+    cp "assets/manual/$PROJECT_EXECUTABLE.1" "$tempdir/$package_name"
     cp README.md "$tempdir/$package_name"
     cp LICENSE-MIT "$tempdir/$package_name"
     cp LICENSE-APACHE "$tempdir/$package_name"
@@ -43,7 +51,7 @@ pack() {
     # TODO: disabled for now, see issue #372
     # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".bash "$tempdir/$package_name/autocomplete/${PROJECT_NAME}.bash-completion"
     # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".fish "$tempdir/$package_name/autocomplete"
-    cp assets/completions/bat.fish "$tempdir/$package_name/autocomplete"
+    cp "assets/completions/$PROJECT_EXECUTABLE.fish" "$tempdir/$package_name/autocomplete"
     # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/_"$PROJECT_NAME" "$tempdir/$package_name/autocomplete"
 
     # archiving
@@ -104,11 +112,11 @@ make_deb() {
     "${gcc_prefix}"strip "$tempdir/usr/bin/$PROJECT_NAME"
 
     # manpage
-    install -Dm644 "doc/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
+    install -Dm644 "assets/manual/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
     gzip --best "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
 
     # completions
-    install -Dm644 assets/completions/bat.fish "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
+    install -Dm644 "assets/completions/$PROJECT_EXECUTABLE.fish" "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
 
     # readme and license
     install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md"