mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-08 08:50:47 +00:00
fix(shell): assign positional parameters to local variables
Replace direct $1/$2/$3 usage with named local variables in _log(), msg(), msg_err(), msg_done(), msg_run(), msg_ok(), and array_diff() (SonarCloud rule shelldre:S7679).
This commit is contained in:
@@ -85,7 +85,8 @@ if ! declare -f msg > /dev/null; then
|
||||
# $1 - message (string)
|
||||
msg()
|
||||
{
|
||||
[[ "$VERBOSE" -eq 1 ]] && msgr msg "$1"
|
||||
local message="$1"
|
||||
[[ "$VERBOSE" -eq 1 ]] && msgr msg "$message"
|
||||
return 0
|
||||
}
|
||||
msg "msg was not defined, defined it now"
|
||||
@@ -97,7 +98,8 @@ if ! declare -f msg_err > /dev/null; then
|
||||
# $1 - error message (string)
|
||||
msg_err()
|
||||
{
|
||||
msgr err "$1" >&2
|
||||
local message="$1"
|
||||
msgr err "$message" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
@@ -108,7 +110,8 @@ if ! declare -f msg_done > /dev/null; then
|
||||
# $1 - message (string)
|
||||
msg_done()
|
||||
{
|
||||
msgr "done" "$1"
|
||||
local message="$1"
|
||||
msgr "done" "$message"
|
||||
return 0
|
||||
}
|
||||
fi
|
||||
@@ -119,7 +122,8 @@ if ! declare -f msg_run > /dev/null; then
|
||||
# $1 - message (string)
|
||||
msg_run()
|
||||
{
|
||||
msgr run "$1"
|
||||
local message="$1"
|
||||
msgr run "$message"
|
||||
return 0
|
||||
}
|
||||
fi
|
||||
@@ -130,7 +134,8 @@ if ! declare -f msg_ok > /dev/null; then
|
||||
# $1 - message (string)
|
||||
msg_ok()
|
||||
{
|
||||
msgr ok "$1"
|
||||
local message="$1"
|
||||
msgr ok "$message"
|
||||
return 0
|
||||
}
|
||||
fi
|
||||
@@ -145,12 +150,15 @@ if ! declare -f array_diff > /dev/null; then
|
||||
# Source: https://stackoverflow.com/a/42399479/594940
|
||||
array_diff()
|
||||
{
|
||||
local result_var="$1"
|
||||
local arr1_name="$2"
|
||||
local arr2_name="$3"
|
||||
# shellcheck disable=SC1083,SC2086
|
||||
eval local ARR1=\(\"\${$2[@]}\"\)
|
||||
eval local ARR1=\(\"\${${arr1_name}[@]}\"\)
|
||||
# shellcheck disable=SC1083,SC2086
|
||||
eval local ARR2=\(\"\${$3[@]}\"\)
|
||||
eval local ARR2=\(\"\${${arr2_name}[@]}\"\)
|
||||
local IFS=$'\n'
|
||||
mapfile -t "$1" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
|
||||
mapfile -t "$result_var" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
|
||||
return 0
|
||||
}
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user