refactor: use eval instead of tweaking POSIX mode in 3rd party loaders

scop · scop · commit 43da208ace65 · 2023-03-26T14:30:51.000+03:00
Per the note in CONTRIBUTING.md, #905 (comment)
diff --git a/completions/_cargo b/completions/_cargo
@@ -3,13 +3,8 @@
 # This serves as a fallback in case the completion is not installed otherwise.
 
 # shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)
-set +o posix
-
 local rustup="${1%cargo}rustup" # use rustup from same dir
-. <("$rustup" completions bash cargo 2>/dev/null)
-
-$_comp__load_3rdparty_reset_shopt
+eval -- "$("$rustup" completions bash cargo 2>/dev/null)"
 
 {
     complete -p "$1" || complete -p "${1##*/}"
diff --git a/completions/_gh b/completions/_gh
@@ -3,13 +3,7 @@
 #
 # This serves as a fallback in case the completion is not installed otherwise.
 
-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)
-set +o posix
-
-. <("$1" completion --shell bash 2>/dev/null)
-
-$_comp__load_3rdparty_reset_shopt
+eval -- "$("$1" completion --shell bash 2>/dev/null)"
 
 {
     complete -p "$1" || complete -p "${1##*/}"
diff --git a/completions/_golangci-lint b/completions/_golangci-lint
@@ -4,13 +4,7 @@
 #
 # This serves as a fallback in case the completion is not installed otherwise.
 
-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)
-set +o posix
-
-. <("$1" completion bash 2>/dev/null)
-
-$_comp__load_3rdparty_reset_shopt
+eval -- "$("$1" completion bash 2>/dev/null)"
 
 {
     complete -p "$1" || complete -p "${1##*/}"
diff --git a/completions/_ruff b/completions/_ruff
@@ -3,13 +3,7 @@
 #
 # This serves as a fallback in case the completion is not installed otherwise.
 
-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)
-set +o posix
-
-. <("$1" generate-shell-completion bash 2>/dev/null)
-
-$_comp__load_3rdparty_reset_shopt
+eval -- "$("$1" generate-shell-completion bash 2>/dev/null)"
 
 {
     complete -p "$1" || complete -p "${1##*/}"
diff --git a/completions/_rustup b/completions/_rustup
@@ -2,13 +2,7 @@
 #
 # This serves as a fallback in case the completion is not installed otherwise.
 
-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)
-set +o posix
-
-. <("$1" completions bash rustup 2>/dev/null)
-
-$_comp__load_3rdparty_reset_shopt
+eval -- "$("$1" completions bash rustup 2>/dev/null)"
 
 {
     complete -p "$1" || complete -p "${1##*/}"
diff --git a/completions/_yq b/completions/_yq
@@ -3,13 +3,7 @@
 #
 # This serves as a fallback in case the completion is not installed otherwise.
 
-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)
-set +o posix
-
-. <("$1" shell-completion bash 2>/dev/null)
-
-$_comp__load_3rdparty_reset_shopt
+eval -- "$("$1" shell-completion bash 2>/dev/null)"
 
 {
     complete -p "$1" || complete -p "${1##*/}"

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# This serves as a fallback in case the completion is not installed otherwise.`
`5`	`5`
`6`		`-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion`
`7`		`-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)`
`8`		`-set +o posix`
`9`		`-`
`10`		`-. <("$1" completion --shell bash 2>/dev/null)`
`11`		`-`
`12`		`-$_comp__load_3rdparty_reset_shopt`
	`6`	`+eval -- "$("$1" completion --shell bash 2>/dev/null)"`
`13`	`7`
`14`	`8`	`{`
`15`	`9`	`complete -p "$1" \|\| complete -p "${1##*/}"`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# This serves as a fallback in case the completion is not installed otherwise.`
`6`	`6`
`7`		`-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion`
`8`		`-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)`
`9`		`-set +o posix`
`10`		`-`
`11`		`-. <("$1" completion bash 2>/dev/null)`
`12`		`-`
`13`		`-$_comp__load_3rdparty_reset_shopt`
	`7`	`+eval -- "$("$1" completion bash 2>/dev/null)"`
`14`	`8`
`15`	`9`	`{`
`16`	`10`	`complete -p "$1" \|\| complete -p "${1##*/}"`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# This serves as a fallback in case the completion is not installed otherwise.`
`4`	`4`
`5`		`-# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion`
`6`		`-local _comp__load_3rdparty_reset_shopt=$(shopt -po posix)`
`7`		`-set +o posix`
`8`		`-`
`9`		`-. <("$1" completions bash rustup 2>/dev/null)`
`10`		`-`
`11`		`-$_comp__load_3rdparty_reset_shopt`
	`5`	`+eval -- "$("$1" completions bash rustup 2>/dev/null)"`
`12`	`6`
`13`	`7`	`{`
`14`	`8`	`complete -p "$1" \|\| complete -p "${1##*/}"`