ci: update deployment for doc rearrangement

This fixes CI to handle the new documentation files. We also continue to
do more cleanup. In particular, we devise a nicer way of detecting the
most recent Cargo OUT_DIR by writing a dummy file, and looking for the
most recently modified version of that file.

ci/before_deploy.sh

@@ -17,31 +17,39 @@ mk_artifacts() {
 }
 
 mk_tarball() {
+    # When cross-compiling, use the right `strip` tool on the binary.
     local gcc_prefix="$(gcc_prefix)"
-    local td="$(mktemp -d)"
+    # Create a temporary dir that contains our staging area.
+    # $tmpdir/$name is what eventually ends up as the deployed archive.
+    local tmpdir="$(mktemp -d)"
     local name="${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}"
-    local staging="$td/$name"
-    mkdir -p "$staging/complete"
+    local staging="$tmpdir/$name"
+    mkdir -p "$staging"/{complete,doc}
+    # The deployment directory is where the final archive will reside.
+    # This path is known by the .travis.yml configuration.
     local out_dir="$(pwd)/deployment"
     mkdir -p "$out_dir"
+    # Find the correct (most recent) Cargo "out" directory. The out directory
+    # contains shell completion files and the man page.
+    local cargo_out_dir="$(cargo_out_dir "target/$TARGET")"
 
     # Copy the ripgrep binary and strip it.
-    cp target/$TARGET/release/rg "$staging/rg"
+    cp "target/$TARGET/release/rg" "$staging/rg"
     "${gcc_prefix}strip" "$staging/rg"
-    # Copy the README and licenses.
+    # Copy the licenses and README.
     cp {README.md,UNLICENSE,COPYING,LICENSE-MIT} "$staging/"
+    # Copy documentation and man page.
+    cp {CHANGELOG.md,FAQ.md,GUIDE.md} "$staging/doc/"
+    if command -V a2x 2>&1 > /dev/null; then
+      # The man page should only exist if we have asciidoc installed.
+      cp "$cargo_out_dir/rg.1" "$staging/doc/"
+    fi
     # Copy shell completion files.
-    cp \
-      target/"$TARGET"/release/build/ripgrep-*/out/{rg.bash,rg.fish,_rg.ps1} \
-      "$staging/complete/"
-    cp complete/_rg "$td/$name/complete/"
-    # Copy man page.
-    cp \
-      target/"$TARGET"/release/build/ripgrep-*/out/rg.1 \
-      "$td/$name/"
+    cp "$cargo_out_dir"/{rg.bash,rg.fish,_rg.ps1} "$staging/complete/"
+    cp complete/_rg "$staging/complete/"
 
-    (cd "$td" && tar czf "$out_dir/$name.tar.gz" *)
-    rm -rf "$td"
+    (cd "$tmpdir" && tar czf "$out_dir/$name.tar.gz" "$name")
+    rm -rf "$tmpdir"
 }
 
 main() {