extern/bat-extras
1
0
Fork 0
mirror of https://github.com/eth-p/bat-extras.git synced 2025-06-20 11:47:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

batpipe: Fix incorrect detection of inner paths

Browse Source
This commit is contained in:
Ethan P 2021-03-24 19:37:24 -07:00
parent 55eaf189dc
commit fa32c5875d
No known key found for this signature in database
GPG Key ID: 6963FD04F6CF35EA
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/batpipe.sh
View File

@ -31,6 +31,9 @@
# batpipe_header [pattern] [...] -- Print a viewer header line. # batpipe_header [pattern] [...] -- Print a viewer header line.
# batpipe_subheader [pattern] [...] -- Print a viewer subheader line. # batpipe_subheader [pattern] [...] -- Print a viewer subheader line.
# #
# bat -- Use `bat` for highlighting.
# bat_if_not_bat [...] -- Use `bat` for highlighting (only supported in `less`).
#
# strip_trailing_slashes [path] -- Strips trailing slashes from a path. # strip_trailing_slashes [path] -- Strips trailing slashes from a path.
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -262,9 +265,20 @@ __TARGET_FILE="$(strip_trailing_slashes "$1")"
# This allows inner paths of archives to be used. # This allows inner paths of archives to be used.
while ! [[ -e "$__TARGET_FILE" ]]; do while ! [[ -e "$__TARGET_FILE" ]]; do
__TARGET_INSIDE="$(basename -- "${__TARGET_FILE}")/${__TARGET_INSIDE}" __TARGET_INSIDE="$(basename -- "${__TARGET_FILE}")/${__TARGET_INSIDE}"
__TARGET_FILE="$(dirname "${__TARGET_FILE}")" __TARGET_FILE="$(dirname -- "${__TARGET_FILE}")"
done done
# If the target file isn't actually a file, then the inner path should be appended.
if ! [[ -f "$__TARGET_FILE" ]]; then
__TARGET_FILE="${__TARGET_FILE}/${__TARGET_INSIDE}"
__TARGET_INSIDE=""
fi
# If an inner path exists or the target file isn't a directory, the target file should not have trailing slashes.
if [[ -n "$__TARGET_INSIDE" ]] || ! [[ -d "$__TARGET_FILE" ]]; then
__TARGET_FILE="$(strip_trailing_slashes "$__TARGET_FILE")"
fi
# Remove trailing slash of the inner target path. # Remove trailing slash of the inner target path.
__TARGET_INSIDE="$(strip_trailing_slashes "$__TARGET_INSIDE")" __TARGET_INSIDE="$(strip_trailing_slashes "$__TARGET_INSIDE")"
__TARGET_BASENAME="$(basename -- "$__TARGET_FILE")" __TARGET_BASENAME="$(basename -- "$__TARGET_FILE")"