From 8914b43845e36ea7fbaff8063531238ac0eb132f Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Tue, 5 Dec 2017 01:42:53 -0700 Subject: [PATCH] Fix deb build --- ci/before_deploy.bash | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/before_deploy.bash b/ci/before_deploy.bash index 0c4f661..6959549 100755 --- a/ci/before_deploy.bash +++ b/ci/before_deploy.bash @@ -63,29 +63,29 @@ make_deb() { esac version=${TRAVIS_TAG#v} if [[ $TARGET = *musl* ]]; then - dpkgname=$PACKAGE_NAME-musl - conflictname=$PACKAGE_NAME + dpkgname=$PROJECT_NAME-musl + conflictname=$PROJECT_NAME else - dpkgname=$PACKAGE_NAME - conflictname=$PACKAGE_NAME-musl + dpkgname=$PROJECT_NAME + conflictname=$PROJECT_NAME-musl fi tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t tmp) # copy the main binary - install -Dm755 "target/$TARGET/release/build/$PROJECT_NAME" "$tempdir/usr/bin/$PROJECT_NAME" + install -Dm755 "target/$TARGET/release/$PROJECT_NAME" "$tempdir/usr/bin/$PROJECT_NAME" strip "$tempdir/usr/bin/$PROJECT_NAME" # manpage install -Dm644 "doc/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1" # readme and license - install -Dm644 README.md "$tempdir/usr/share/doc/$PACKAGE_NAME/README.md" - install -Dm644 LICENSE-MIT "$tempdir/usr/share/doc/$PACKAGE_NAME/LICENSE-MIT" - install -Dm644 LICENSE-APACHE "$tempdir/usr/share/doc/$PACKAGE_NAME/LICENSE-APACHE" + install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md" + install -Dm644 LICENSE-MIT "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-MIT" + install -Dm644 LICENSE-APACHE "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-APACHE" # completions - install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/$PROJECT_NAME.bash_completion "$tempdir/usr/share/bash-completion/completions/$PROJECT_NAME.bash_completion" + install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/$PROJECT_NAME.bash-completion "$tempdir/usr/share/bash_completion/completions/$PROJECT_NAME" install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/$PROJECT_NAME.fish "$tempdir/usr/share/fish/vendor_completions.d/$PROJECT_NAME.fish" install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/_$PROJECT_NAME "$tempdir/usr/share/zsh/site-functions/_$PROJECT_NAME" @@ -98,7 +98,7 @@ Section: utils Priority: optional Maintainer: David Peter Architecture: $architecture -Provides: $PACKAGE_NAME +Provides: $PROJECT_NAME Conflicts: $conflictname Description: Simple, fast and user-friendly alternative to find EOF