summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2020-03-15 20:43:13 -0400
committerAndrew Gallant <jamslam@gmail.com>2020-03-15 21:06:45 -0400
commit52ec68799ccf43f77170585a9065021a54441478 (patch)
tree26b5755e6ab6eaa5b6536fac19e0c9779b7990df /ci
parentc0d78240dfe4e67244767296e1f89284925d6d82 (diff)
ci: make script names consistent
Diffstat (limited to 'ci')
-rwxr-xr-xci/build-deb (renamed from ci/build_deb.sh)15
-rwxr-xr-xci/sha256-releases (renamed from ci/sha256.sh)0
-rwxr-xr-xci/test-complete (renamed from ci/test_complete.sh)0
3 files changed, 4 insertions, 11 deletions
diff --git a/ci/build_deb.sh b/ci/build-deb
index 4812b47e..e16e8f05 100755
--- a/ci/build_deb.sh
+++ b/ci/build-deb
@@ -1,6 +1,7 @@
#!/bin/bash
set -e
+D="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
# This script builds a binary dpkg for Debian based distros. It does not
# currently run in CI, and is instead run manually and the resulting dpkg is
@@ -23,20 +24,12 @@ fi
# the deb, which knows where to look.
DEPLOY_DIR=deployment/deb
+OUT_DIR="$("$D"/cargo-out-dir target/debug/)"
mkdir -p "$DEPLOY_DIR"
cargo build
-# Find and copy man page.
-manpage="$(find ./target/debug -name rg.1 -print0 | xargs -0 ls -t | head -n1)"
-cp "$manpage" "$DEPLOY_DIR/"
-
-# Do the same for shell completions.
-compbash="$(find ./target/debug -name rg.bash -print0 | xargs -0 ls -t | head -n1)"
-cp "$compbash" "$DEPLOY_DIR/"
-compfish="$(find ./target/debug -name rg.fish -print0 | xargs -0 ls -t | head -n1)"
-cp "$compfish" "$DEPLOY_DIR/"
-compzsh="complete/_rg"
-cp "$compzsh" "$DEPLOY_DIR/"
+# Copy man page and shell completions.
+cp "$OUT_DIR"/{rg.1,rg.bash,rg.fish,_rg} "$DEPLOY_DIR/"
# Since we're distributing the dpkg, we don't know whether the user will have
# PCRE2 installed, so just do a static build.
diff --git a/ci/sha256.sh b/ci/sha256-releases
index 670c9766..670c9766 100755
--- a/ci/sha256.sh
+++ b/ci/sha256-releases
diff --git a/ci/test_complete.sh b/ci/test-complete
index ff11c802..ff11c802 100755
--- a/ci/test_complete.sh
+++ b/ci/test-complete