Merge pull request #16 from rsteube/bash-fix-parameter-expansion

bash: fix parameter expansion
carapace-sh · Apr 3, 2020 · dbd5912 · dbd5912
2 parents 25348f4 + 05d1b53
commit dbd5912
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/bash/snippet.go b/bash/snippet.go
@@ -16,7 +16,7 @@ _%v_callback() {
   local last="${COMP_WORDS[${COMP_CWORD}]}"
   if [[ $last =~ ^[\"\'] ]] && ! echo "$last" | xargs echo 2>/dev/null >/dev/null ; then
       compline="${compline}${last:0:1}"
-      last="${last/ /\\\\ }" 
+      last="${last// /\\\\ }" 
   fi
 
   echo "$compline" | sed -e 's/ $/ _/' -e 's/"/\"/g' | xargs %v _carapace bash "$1"
@@ -28,9 +28,9 @@ _%v_completions() {
   
   if [[ $last =~ ^[\"\'] ]] && ! echo "$last" | xargs echo 2>/dev/null >/dev/null ; then
       compline="${compline}${last:0:1}"
-      last="${last/ /\\\\ }" 
+      last="${last// /\\\\ }" 
   else
-      last="${last/ /\\\ }" 
+      last="${last// /\\\ }" 
   fi
 
   local state=$(echo "$compline" | sed -e "s/ \$/ _/" -e 's/"/\"/g' | xargs %v _carapace bash state)
@@ -41,7 +41,7 @@ _%v_completions() {
 %v
   esac
 
-  [[ $last =~ ^[\"\'] ]] && COMPREPLY=("${COMPREPLY[@]/\\ /\ }")
+  [[ $last =~ ^[\"\'] ]] && COMPREPLY=("${COMPREPLY[@]//\\ /\ }")
   [[ $COMPREPLY == */ ]] && compopt -o nospace
 }
 

diff --git a/example/cmd/root_test.go b/example/cmd/root_test.go
@@ -14,7 +14,7 @@ _example_callback() {
   local last="${COMP_WORDS[${COMP_CWORD}]}"
   if [[ $last =~ ^[\"\'] ]] && ! echo "$last" | xargs echo 2>/dev/null >/dev/null ; then
       compline="${compline}${last:0:1}"
-      last="${last/ /\\\\ }" 
+      last="${last// /\\\\ }" 
   fi
 
   echo "$compline" | sed -e 's/ $/ _/' -e 's/"/\"/g' | xargs example _carapace bash "$1"
@@ -26,9 +26,9 @@ _example_completions() {
   
   if [[ $last =~ ^[\"\'] ]] && ! echo "$last" | xargs echo 2>/dev/null >/dev/null ; then
       compline="${compline}${last:0:1}"
-      last="${last/ /\\\\ }" 
+      last="${last// /\\\\ }" 
   else
-      last="${last/ /\\\ }" 
+      last="${last// /\\\ }" 
   fi
 
   local state=$(echo "$compline" | sed -e "s/ \$/ _/" -e 's/"/\"/g' | xargs example _carapace bash state)
@@ -162,7 +162,7 @@ _example_completions() {
 
   esac
 
-  [[ $last =~ ^[\"\'] ]] && COMPREPLY=("${COMPREPLY[@]/\\ /\ }")
+  [[ $last =~ ^[\"\'] ]] && COMPREPLY=("${COMPREPLY[@]//\\ /\ }")
   [[ $COMPREPLY == */ ]] && compopt -o nospace
 }