Merge pull request scop#1397 from akinomyoga/scp-refactor-1-2

fix(rsync,ssh,sshfs): do not generate regular files *'\' as dirs

Author: scop

completions/ssh

@@ -512,15 +512,15 @@ _comp_xfunc_scp_compgen_remote_files()
         # 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"'/'"$_escape_replacement"'/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"'/'"$_escape_replacement"'/g' -e 's/[*@|=]$//g' \
-                -e 's/[^\/]$/& /g')
+                -e 's/[^/]$/& /g')
     fi
     _comp_compgen -R split -l -- "$_files"
 }
@@ -550,13 +550,13 @@ _comp_xfunc_scp_compgen_local_files()
         _comp_compgen -RU files split -l -- "$(
             command ls -aF1dL "${files[@]}" 2>/dev/null |
                 command sed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
-                    -e '/[^\/]$/d' -e "s/^/${1-}/"
+                    -e '/[^/]$/d' -e "s/^/${1-}/"
         )"
     else
         _comp_compgen -RU files split -l -- "$(
             command ls -aF1dL "${files[@]}" 2>/dev/null |
                 command sed -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
-                    -e 's/[*@|=]$//g' -e 's/[^\/]$/& /g' -e "s/^/${1-}/"
+                    -e 's/[*@|=]$//g' -e 's/[^/]$/& /g' -e "s/^/${1-}/"
         )"
     fi
 }

completions/sshfs

@@ -8,9 +8,10 @@ _comp_cmd_sshfs()
     _comp_expand || return
 
     if [[ $cur == *:* ]]; then
-        _comp_compgen -x scp remote_files -d
-        # unlike scp and rsync, sshfs works with 1 backslash instead of 3
-        COMPREPLY=("${COMPREPLY[@]//\\\\\\/\\}")
+        if _comp_compgen -x scp remote_files -d; then
+            # unlike scp and rsync, sshfs works with 1 backslash instead of 3
+            COMPREPLY=("${COMPREPLY[@]//\\\\\\/\\}")
+        fi
         return
     fi
 

test/fixtures/sshfs/local_path-dir/dummy.txt

@@ -1,8 +1,20 @@
 import pytest
 
+from conftest import assert_bash_exec, assert_complete
+
 
 @pytest.mark.bashcomp(ignore_env=r"^[+-]_comp_cmd_scp__path_esc=")
 class TestSshfs:
     @pytest.mark.complete("sshfs ./")
     def test_1(self, completion):
         assert completion
+
+    @pytest.mark.complete("sshfs local_path", cwd="sshfs")
+    def test_local_path_suffix_1(self, completion):
+        assert completion == "-dir/"
+
+    def test_remote_path_ending_with_backslash(self, bash):
+        assert_bash_exec(bash, "ssh() { echo 'hypothetical\\'; }")
+        completion = assert_complete(bash, "sshfs remote_host:hypo")
+        assert_bash_exec(bash, "unset -f ssh")
+        assert not completion