plugin/xterm: don't rely on $1

gaelicWizard · gaelicWizard · commit bdfb987f0c6c · 2021-10-20T15:50:15.000-04:00
_bash-preexec_ passes the "current" command line as `$1`, but this is unreliable and we explicitly discourage it's use.

Use `$BASH_COMMAND` instead.
diff --git a/plugins/available/xterm.plugin.bash b/plugins/available/xterm.plugin.bash
@@ -30,7 +30,11 @@ precmd_xterm_title() {
 }
 
 preexec_xterm_title() {
-	set_xterm_title "$(_short-command "${1:-}") {$(_short-dirname)} (${SHORT_USER:-${USER}}@${SHORT_HOSTNAME:-${HOSTNAME}})"
+	local command_line="${BASH_COMMAND:-${1:-}}"
+	local directory_name short_command
+	directory_name="$(_short-dirname)"
+	short_command="$(_short-command "${command_line}")"
+	set_xterm_title "${short_command} {${directory_name}} (${SHORT_USER:-${USER}}@${SHORT_HOSTNAME:-${HOSTNAME}})"
 }
 
 case "${TERM:-dumb}" in

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@ precmd_xterm_title() {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`preexec_xterm_title() {`
`33`		`- set_xterm_title "$(_short-command "${1:-}") {$(_short-dirname)} (${SHORT_USER:-${USER}}@${SHORT_HOSTNAME:-${HOSTNAME}})"`
	`33`	`+ local command_line="${BASH_COMMAND:-${1:-}}"`
	`34`	`+ local directory_name short_command`
	`35`	`+ directory_name="$(_short-dirname)"`
	`36`	`+ short_command="$(_short-command "${command_line}")"`
	`37`	`+ set_xterm_title "${short_command} {${directory_name}} (${SHORT_USER:-${USER}}@${SHORT_HOSTNAME:-${HOSTNAME}})"`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`case "${TERM:-dumb}" in`