mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-29 05:18:13 +00:00
Code Issues Releases Wiki Activity

utilities/bashcomp: Fix PS1 generation on new bash.

Browse Source 
The current implementation used to extract PS1 prompt for ovs-vsctl is
broken on recent Bash releases.
Starting from Bash 4.4 it's possible to use @P expansion in order to get
the quoted PS1 directly.

This commit makes the 2 bash completion files to use @P expansion in order
to get the quoted PS1 on Bash >= 4.4.

Reported-at: https://bugzilla.redhat.com/2170344
Reported-by: Martin Necas <mnecas@redhat.com>
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Timothy Redaelli 2023-05-26 19:16:38 +02:00 committed by Ilya Maximets
parent c3e410a03a
commit e3d0e84ed3
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utilities/ovs-appctl-bashcomp.bash
View File

@ -223,6 +223,13 @@ printf_stderr() {
# The code below is taken from Peter Amidon. His change makes it more # The code below is taken from Peter Amidon. His change makes it more
# robust. # robust.
extract_bash_prompt() { extract_bash_prompt() {
# On Bash 4.4+ just use the @P expansion
if ((BASH_VERSINFO[0] > 4 ||
(BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
_BASH_PROMPT="${PS1@P}"
return
fi
local myPS1 v local myPS1 v
myPS1="$(sed 's/Begin prompt/\\Begin prompt/; s/End prompt/\\End prompt/' <<< "$PS1")" myPS1="$(sed 's/Begin prompt/\\Begin prompt/; s/End prompt/\\End prompt/' <<< "$PS1")"

7
utilities/ovs-vsctl-bashcomp.bash
View File

@ -413,6 +413,13 @@ _ovs_vsctl_get_PS1 () {
return; return;
fi fi
# On Bash 4.4+ just use the @P expansion
if ((BASH_VERSINFO[0] > 4 ||
(BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
printf '%s\n' "${PS1@P}"
return
fi
# Original inspiration from # Original inspiration from
# http://stackoverflow.com/questions/10060500/bash-how-to-evaluate-ps1-ps2, # http://stackoverflow.com/questions/10060500/bash-how-to-evaluate-ps1-ps2,
# but changed quite a lot to make it more robust. # but changed quite a lot to make it more robust.