diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-10-06 16:20:12 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-06 16:20:35 -0500 |
| commit | 5de548e5ee8fd5fc9873963ae4a9d477b2bfdcb3 (patch) | |
| tree | 89a14aace737cf68e2e519529cd79f9a2b676c8b /functions | |
| parent | 9e07fa4ddef970f4e6370d6513051239811f0534 (diff) | |
| download | vyatta-op-5de548e5ee8fd5fc9873963ae4a9d477b2bfdcb3.tar.gz vyatta-op-5de548e5ee8fd5fc9873963ae4a9d477b2bfdcb3.zip | |
Bugfix 6747: use bash conditional expressions instead of posix test expressions when doing comparisons. The conditional expressions don't do as much expansion as the test expression does, and are the modern variant
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/interpreter/vyatta-common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functions/interpreter/vyatta-common b/functions/interpreter/vyatta-common index 0a98d56..c6e645f 100644 --- a/functions/interpreter/vyatta-common +++ b/functions/interpreter/vyatta-common @@ -34,7 +34,7 @@ get_prefix_filtered_list () local idx=0 for elem in "${olist[@]}"; do local sub=${elem#$pfx} - if [ "$elem" == "$sub" ] && [ -n "$pfx" ]; then + if [[ "$elem" == "$sub" ]] && [[ -n "$pfx" ]]; then continue fi eval "$3[$idx]=\"$elem\"" @@ -60,7 +60,7 @@ get_prefix_filtered_list2 () eval "local elem=\${$2[$orig_idx]}" eval "local elem2=\${$4[$orig_idx]}" local sub=${elem#$pfx} - if [ "$elem" == "$sub" ] && [ -n "$pfx" ]; then + if [[ "$elem" == "$sub" ]] && [[ -n "$pfx" ]]; then continue fi eval "$3[$idx]=\"$elem\"" |