diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:07:49 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:07:49 +0100 |
| commit | 47d02bb6717de574692096860e7d9e13b0769d6a (patch) | |
| tree | da8eb974a893b95ab615f0d5114cf4d8538cf5e6 /functions | |
| parent | 06201c4e9ccb68341bebbf73acab74e6d51ab361 (diff) | |
| parent | 5c5fe70a36224ffee505483cf8c77bd3a662d816 (diff) | |
| download | vyatta-cfg-47d02bb6717de574692096860e7d9e13b0769d6a.tar.gz vyatta-cfg-47d02bb6717de574692096860e7d9e13b0769d6a.zip | |
Merge branch 'equuleus' of github.com:vyos/vyatta-cfg into current
* 'equuleus' of github.com:vyos/vyatta-cfg:
T1604: run bash builtin "set" as-is in vyatta_cfg_run
Jenkins: import Pipeline from vyos-1x commit e541ffc4f34c
update Jenkins file for equuleus
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/interpreter/vyatta-cfg-run | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/functions/interpreter/vyatta-cfg-run b/functions/interpreter/vyatta-cfg-run index 3ec3d6f..5034284 100644 --- a/functions/interpreter/vyatta-cfg-run +++ b/functions/interpreter/vyatta-cfg-run @@ -509,6 +509,14 @@ vyatta_cfg_cmd () ### Main run command ### vyatta_cfg_run () { + # if run with bash builtin "set -/+*" run set and return + # this happens when a different completion script runs eval "set ..." + # (VyOS T1604) + if [[ "$1" == "set" && "$2" =~ ^(-|\+).* ]]; then + set "${@:2}" + return + fi + # validate top level command and execute proper function local cmd=$1 local -a args=( "$@" ) |