fix(rsync): overescape remote paths if rsync version is < 3.2.4

Author: Rogach

completions/rsync

@@ -1,5 +1,35 @@
 # bash completion for rsync                                -*- shell-script -*-
 
+_comp_cmd_rsync__vercomp()
+{
+    if [[ "$1" == "$2" ]]; then
+        return 0
+    fi
+    local IFS=.
+    local i ver1=($1) ver2=($2)
+    # fill empty fields in ver1 with zeros
+    for ((i = ${#ver1[@]}; i < ${#ver2[@]}; i++)); do
+        ver1[i]=0
+    done
+    for ((i = 0; i < ${#ver1[@]}; i++)); do
+        if [[ ! ${ver1[i]} ]]; then
+            # replace empty strings ver1 with zeros
+            ver1[i]=0
+        fi
+        if [[ ! ${ver2[i]} ]]; then
+            # fill empty fields in ver2 with zeros
+            ver2[i]=0
+        fi
+        if ((10#${ver1[i]} > 10#${ver2[i]})); then
+            return 1
+        fi
+        if ((10#${ver1[i]} < 10#${ver2[i]})); then
+            return 2
+        fi
+    done
+    return 0
+}
+
 _rsync()
 {
     local cur prev words cword split comp_args
@@ -59,7 +89,15 @@ _rsync()
                     break
                 fi
             done
-            [[ $shell == ssh ]] && _comp_xfunc ssh scp_remote_files
+            if [[ $shell == ssh ]]; then
+                local rsync_version=$(rsync --version | sed -n 's/rsync  version \([0-9\.]*\).*/\1/; 1p')
+                _comp_cmd_rsync__vercomp "$rsync_version" "3.2.4"
+                if [[ $? == "2" ]]; then
+                    _comp_xfunc ssh scp_remote_files
+                else
+                    _comp_xfunc ssh scp_remote_files no-overescape
+                fi
+            fi
             ;;
         *)
             _known_hosts_real -c -a -- "$cur"

completions/ssh

@@ -434,8 +434,11 @@ _comp_cmd_scp__path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
 # shellcheck disable=SC2120
+# @param  $1 `no-overescape` if we should use 1 backslash for escaping instead of 3
 _comp_xfunc_ssh_scp_remote_files()
 {
+    local no_overescape=$1
+
     # remove backslash escape from the first colon
     cur=${cur/\\:/:}
 
@@ -451,20 +454,25 @@ _comp_xfunc_ssh_scp_remote_files()
         path=$(ssh -o 'Batchmode yes' "$userhost" pwd 2>/dev/null)
     fi
 
+    local escape_replacement='\\\\\\&'
+    if [[ "$no_overescape" == "no-overescape" ]]; then
+        escape_replacement='\\&'
+    fi
+
     local files
     if [[ ${1-} == -d ]]; then
         # escape problematic characters; remove non-dirs
         # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' "$userhost" \
             command ls -aF1dL "$path*" 2>/dev/null |
-            command sed -e 's/'"$_comp_cmd_scp__path_esc"'/\\&/g' -e '/[^\/]$/d')
+            command sed -e 's/'"$_comp_cmd_scp__path_esc"'/'"$escape_replacement"'/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
         # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' "$userhost" \
             command ls -aF1dL "$path*" 2>/dev/null |
-            command sed -e 's/'"$_comp_cmd_scp__path_esc"'/\\&/g' -e 's/[*@|=]$//g' \
+            command sed -e 's/'"$_comp_cmd_scp__path_esc"'/'"$escape_replacement"'/g' -e 's/[*@|=]$//g' \
                 -e 's/[^\/]$/& /g')
     fi
     _comp_split -la COMPREPLY "$files"