fixed spellcheck and minor issues for release
This commit is contained in:
+5
-4
@@ -63,6 +63,7 @@ _getopt_split()
|
||||
_gs_out=()
|
||||
|
||||
while [[ -n "$s" ]]; do
|
||||
# shellcheck disable=SC1003 # '\' is a literal backslash
|
||||
case "${s:0:1}" in
|
||||
"'")
|
||||
s="${s:1}"
|
||||
@@ -108,12 +109,12 @@ export -f _getopt_split
|
||||
_trap_restore()
|
||||
{
|
||||
local line
|
||||
local -a w=()
|
||||
local -a _tr_w=()
|
||||
while IFS= read -r line; do
|
||||
[[ "$line" == "trap -- "* ]] || continue
|
||||
_getopt_split w "$line"
|
||||
# w = (trap -- <command> <SIGNAL>)
|
||||
[[ ${#w[@]} -eq 4 ]] && trap -- "${w[2]}" "${w[3]}"
|
||||
_getopt_split _tr_w "$line"
|
||||
# _tr_w = (trap -- <command> <SIGNAL>)
|
||||
[[ ${#_tr_w[@]} -eq 4 ]] && trap -- "${_tr_w[2]}" "${_tr_w[3]}"
|
||||
done <<< "$1"
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -68,6 +68,7 @@ unset _pc_name
|
||||
_prompt_resolve_color()
|
||||
{
|
||||
local rest="$1" out="" name
|
||||
# shellcheck disable=SC2016 # a regular expression, the $ must stay literal
|
||||
local ref_re='^\$(\{('"$_PROMPT_COLOR_RE"')\}|('"$_PROMPT_COLOR_RE"'))'
|
||||
local ansi_re='^(\\e|\\033)\[[0-9;]*m'
|
||||
|
||||
@@ -106,6 +107,7 @@ _prompt_theme_file()
|
||||
# Usage: _prompt_apply_overrides
|
||||
_prompt_apply_overrides()
|
||||
{
|
||||
# shellcheck disable=SC2154 # CONF_prompt is filled by parse_conf (profile.sh)
|
||||
declare -p CONF_prompt >/dev/null 2>&1 || return 0
|
||||
|
||||
local k
|
||||
|
||||
@@ -267,6 +267,7 @@ _rain_enter()
|
||||
saved_stty=$(stty -g 2>/dev/null)
|
||||
saved_traps=$(trap -p TERM INT WINCH)
|
||||
trap _rain_stop TERM INT
|
||||
# shellcheck disable=SC2064 # $1 is the handler name, expanded on purpose
|
||||
trap "$1" WINCH
|
||||
stty -echo
|
||||
printf '\e[?25l\e[2J'
|
||||
|
||||
Reference in New Issue
Block a user