mirror of
https://github.com/sharkdp/bat.git
synced 2025-01-18 12:05:52 +00:00
fix: warnings of ShellCheck
SC2155: Declare and assign separately to avoid masking return values. SC2164: Use cd ... || exit in case cd fails. SC2230: which is non-standard. Use builtin 'command -v' instead.
This commit is contained in:
parent
60e00d49a9
commit
973ea984c8
10
diagnostics/info.sh
vendored
10
diagnostics/info.sh
vendored
@ -58,7 +58,8 @@ _bat_:run() {
|
|||||||
_out "$BAT" --version
|
_out "$BAT" --version
|
||||||
_out env | grep '^BAT_\|^PAGER='
|
_out env | grep '^BAT_\|^PAGER='
|
||||||
|
|
||||||
local cache_dir="$($BAT --cache-dir)"
|
local cache_dir
|
||||||
|
cache_dir="$($BAT --cache-dir)"
|
||||||
if [[ -f "${cache_dir}/syntaxes.bin" ]]; then
|
if [[ -f "${cache_dir}/syntaxes.bin" ]]; then
|
||||||
_print_command "$BAT" "--list-languages"
|
_print_command "$BAT" "--list-languages"
|
||||||
echo "Found custom syntax set."
|
echo "Found custom syntax set."
|
||||||
@ -79,8 +80,8 @@ _bat_config_:run() {
|
|||||||
_bat_wrapper_:run() {
|
_bat_wrapper_:run() {
|
||||||
_bat_wrapper_:detect_wrapper() {
|
_bat_wrapper_:detect_wrapper() {
|
||||||
local bat="$1"
|
local bat="$1"
|
||||||
if file "$(which "${bat}")" | grep "text executable" &> /dev/null; then
|
if file "$(command -v "${bat}")" | grep "text executable" &> /dev/null; then
|
||||||
_out_fence cat "$(which "${bat}")"
|
_out_fence cat "$(command -v "${bat}")"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -104,7 +105,8 @@ _bat_wrapper_function_:run() {
|
|||||||
fi ;;
|
fi ;;
|
||||||
|
|
||||||
*bash* | *zsh*)
|
*bash* | *zsh*)
|
||||||
local type="$("$SHELL" --login -i -c "type ${command}" 2>&1)"
|
local type
|
||||||
|
type="$("$SHELL" --login -i -c "type ${command}" 2>&1)"
|
||||||
if grep 'function' <<< "$type" &> /dev/null; then
|
if grep 'function' <<< "$type" &> /dev/null; then
|
||||||
_out_fence "$SHELL" --login -i -c "declare -f ${command}"
|
_out_fence "$SHELL" --login -i -c "declare -f ${command}"
|
||||||
return
|
return
|
||||||
|
4
tests/benchmarks/comparison.sh
vendored
4
tests/benchmarks/comparison.sh
vendored
@ -1,8 +1,8 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
cd "$(dirname "${BASH_SOURCE[0]}")" || exit
|
||||||
|
|
||||||
if ! which hyperfine > /dev/null 2>&1; then
|
if ! command -v hyperfine > /dev/null 2>&1; then
|
||||||
echo "'hyperfine' does not seem to be installed."
|
echo "'hyperfine' does not seem to be installed."
|
||||||
echo "You can get it here: https://github.com/sharkdp/hyperfine"
|
echo "You can get it here: https://github.com/sharkdp/hyperfine"
|
||||||
exit 1
|
exit 1
|
||||||
|
4
tests/benchmarks/run-benchmarks.sh
vendored
4
tests/benchmarks/run-benchmarks.sh
vendored
@ -1,8 +1,8 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
cd "$(dirname "${BASH_SOURCE[0]}")" || exit
|
||||||
|
|
||||||
if ! which hyperfine > /dev/null 2>&1; then
|
if ! command -v hyperfine > /dev/null 2>&1; then
|
||||||
echo "'hyperfine' does not seem to be installed."
|
echo "'hyperfine' does not seem to be installed."
|
||||||
echo "You can get it here: https://github.com/sharkdp/hyperfine"
|
echo "You can get it here: https://github.com/sharkdp/hyperfine"
|
||||||
exit 1
|
exit 1
|
||||||
|
2
tests/syntax-tests/update.sh
vendored
2
tests/syntax-tests/update.sh
vendored
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
cd "$(dirname "${BASH_SOURCE[0]}")" || exit
|
||||||
|
|
||||||
python="python3"
|
python="python3"
|
||||||
if ! command -v python3 &>/dev/null; then python="python"; fi
|
if ! command -v python3 &>/dev/null; then python="python"; fi
|
||||||
|
Loading…
Reference in New Issue
Block a user