diff options
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | functions/interpreter/vyatta-op-run | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 20eb253..b11267e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,7 @@ pipeline { agent { docker { args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' - image 'vyos/vyos-build:current' + image 'vyos/vyos-build:equuleus' } } options { diff --git a/functions/interpreter/vyatta-op-run b/functions/interpreter/vyatta-op-run index b0f72ae..ee4cb1c 100644 --- a/functions/interpreter/vyatta-op-run +++ b/functions/interpreter/vyatta-op-run @@ -155,6 +155,14 @@ _vyatta_op_conv_run_cmd () _vyatta_op_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 + local -i estat local tpath=$vyatta_op_templates local restore_shopts=$( shopt -p extglob nullglob | tr \\n \; ) |