mirror of
https://github.com/facebook/zstd.git
synced 2025-07-30 22:23:13 +03:00
Change zstdless behavior to align with zless (#2909)
* Change zstdless behavior to align with zless
This commit is contained in:
@ -1,2 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
zstdcat "$@" | less
|
|
||||||
|
zstd=${ZSTD:-zstd}
|
||||||
|
|
||||||
|
# TODO: Address quirks and bugs tied to old versions of less, provide a mechanism to pass flags directly to zstd
|
||||||
|
|
||||||
|
export LESSOPEN="|-${zstd} -cdfq %s"
|
||||||
|
exec less "$@"
|
||||||
|
@ -89,6 +89,7 @@ PRGDIR="$SCRIPT_DIR/../programs"
|
|||||||
TESTDIR="$SCRIPT_DIR/../tests"
|
TESTDIR="$SCRIPT_DIR/../tests"
|
||||||
UNAME=$(uname)
|
UNAME=$(uname)
|
||||||
ZSTDGREP="$PRGDIR/zstdgrep"
|
ZSTDGREP="$PRGDIR/zstdgrep"
|
||||||
|
ZSTDLESS="$PRGDIR/zstdless"
|
||||||
|
|
||||||
detectedTerminal=false
|
detectedTerminal=false
|
||||||
if [ -t 0 ] && [ -t 1 ]
|
if [ -t 0 ] && [ -t 1 ]
|
||||||
@ -322,6 +323,20 @@ ZCAT=./zstdcat "$ZSTDGREP" 2>&1 "1234" tmp_grep_bad.zst && die "Should have fail
|
|||||||
ZCAT=./zstdcat "$ZSTDGREP" 2>&1 "1234" tmp_grep_bad.zst | grep "No such file or directory" || true
|
ZCAT=./zstdcat "$ZSTDGREP" 2>&1 "1234" tmp_grep_bad.zst | grep "No such file or directory" || true
|
||||||
rm -f tmp_grep*
|
rm -f tmp_grep*
|
||||||
|
|
||||||
|
println "\n===> zstdless tests"
|
||||||
|
if [ -n "$(which less)" ]; then
|
||||||
|
ln -sf "$ZSTD_BIN" zstd
|
||||||
|
rm -f tmp_less*
|
||||||
|
echo "1234" > tmp_less
|
||||||
|
zstd -f tmp_less
|
||||||
|
lines=$(ZSTD=./zstd "$ZSTDLESS" 2>&1 tmp_less.zst | wc -l)
|
||||||
|
test 1 -eq $lines
|
||||||
|
ZSTD=./zstd "$ZSTDLESS" -f tmp_less.zst > tmp_less_regenerated
|
||||||
|
$DIFF tmp_less tmp_less_regenerated
|
||||||
|
ZSTD=./zstd "$ZSTDLESS" 2>&1 tmp_less_bad.zst | grep "No such file or directory" || die
|
||||||
|
rm -f tmp_less*
|
||||||
|
fi
|
||||||
|
|
||||||
println "\n===> --exclude-compressed flag"
|
println "\n===> --exclude-compressed flag"
|
||||||
rm -rf precompressedFilterTestDir
|
rm -rf precompressedFilterTestDir
|
||||||
mkdir -p precompressedFilterTestDir
|
mkdir -p precompressedFilterTestDir
|
||||||
|
Reference in New Issue
Block a user