diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-06-05 16:43:14 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-06-05 16:44:33 -0700 |
| commit | 6d762889ffa523806830795b5d1634475f9d14b0 (patch) | |
| tree | 441ca87596cb7e08b0411f9c6c841846e865f781 /etc | |
| parent | cdebe1dc14fb277765f6102956a5e57e840c18f7 (diff) | |
| download | vyatta-cfg-6d762889ffa523806830795b5d1634475f9d14b0.tar.gz vyatta-cfg-6d762889ffa523806830795b5d1634475f9d14b0.zip | |
fix for bug 4505 merge is now called merge.
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index a4147fd..1e0bc6c 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -46,7 +46,7 @@ declare last_idx=0 declare -a comp_words=() # commands to unalias -declare -a unalias_cmds=( clear configure date debug edit exit load load-merge \ +declare -a unalias_cmds=( clear configure date debug edit exit load merge \ no run set show save terminal undebug up top ) for cmd in "${unalias_cmds[@]}"; do unalias $cmd >& /dev/null @@ -138,7 +138,7 @@ load () eval "${vyatta_sbindir}/vyatta-load-config.pl $@" } -load-merge () +merge () { # don't load if there are uncommitted changes. if [ -f "$VYATTA_TEMP_CONFIG_DIR/$VYATTA_MOD_NAME" ]; then @@ -395,6 +395,13 @@ vyatta_loadsave_complete() echo -e " ftp://<user>:<passwd>@<host>/<file>\tLoad from file on remote machine" echo -e " http://<host>/<file>\t\t\tLoad from file on remote machine" echo -e " tftp://<host>/<file>\t\t\tLoad from file on remote machine" + elif [ "${COMP_WORDS[0]}" = "merge" ]; then + echo -e " <Enter>\t\t\t\tMerge from system config file" + echo -e " <file>\t\t\t\tMerge from file on local machine" + echo -e " scp://<user>:<passwd>@<host>/<file>\tMerge from file on remote machine" + echo -e " ftp://<user>:<passwd>@<host>/<file>\tMerge from file on remote machine" + echo -e " http://<host>/<file>\t\t\tMerge from file on remote machine" + echo -e " tftp://<host>/<file>\t\t\tMerge from file on remote machine" elif [ "${COMP_WORDS[0]}" = "save" ]; then echo -e " <Enter>\t\t\t\tSave to system config file" echo -e " <file>\t\t\t\tSave to file on local machine" @@ -892,7 +899,7 @@ vyatta_config_complete () "edit" \ "exit" \ "load" \ - "load-merge" \ + "merge" \ "rename" \ "run" \ "save" \ @@ -1247,6 +1254,7 @@ complete -F vyatta_config_complete exit complete -F vyatta_run_complete run complete -F vyatta_loadsave_complete save complete -F vyatta_loadsave_complete load +complete -F vyatta_loadsave_complete merge complete -F vyatta_config_complete copy complete -F vyatta_config_complete rename |