fix(rsync,scp): remove file-type marks from "ls -F" properly

The type-classifier characters for named pipes (|) and sockets (=)
were not properly removed.  These are escaped by a backslash before
removing, so the backslashes are left.  In this patch, we remove the
type-classifier characters before performing the backslash escaping.

Author: akinomyoga

completions/ssh

@@ -519,7 +519,8 @@ _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 's/[*@|=]$//g' \
+            command sed -e 's/[*@|=]$//g' \
+                -e 's/'"$_comp_cmd_scp__path_esc"'/'"$_escape_replacement"'/g' \
                 -e 's/[^/]$/& /g')
     fi
     _comp_compgen -R split -l -- "$_files"
@@ -555,8 +556,9 @@ _comp_xfunc_scp_compgen_local_files()
     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-}/"
+                command sed -e 's/[*@|=]$//g' \
+                    -e "s/$_comp_cmd_scp__path_esc/\\\\&/g" \
+                    -e 's/[^/]$/& /g' -e "s/^/${1-}/"
         )"
     fi
 }

test/t/test_scp.py

@@ -2,7 +2,12 @@
 
 import pytest
 
-from conftest import assert_bash_exec, assert_complete, bash_env_saved
+from conftest import (
+    assert_bash_exec,
+    assert_complete,
+    bash_env_saved,
+    prepare_fixture_dir,
+)
 
 LIVE_HOST = "bash_completion"
 
@@ -149,3 +154,22 @@ def test_xfunc_remote_files(self, bash):
             "shared/default/foo ",
             "shared/default/foo.d/",
         ]
+
+    @pytest.fixture
+    def tmpdir_mkfifo(self, request, bash):
+        tmpdir, _, _ = prepare_fixture_dir(request, files=[], dirs=[])
+
+        try:
+            assert_bash_exec(bash, "mkfifo '%s/local_path_1-pipe'" % tmpdir)
+        except Exception:
+            pytest.skip(
+                "The present system does not allow creating a named pipe."
+            )
+
+        return tmpdir
+
+    def test_local_path_mark_1(self, bash, tmpdir_mkfifo):
+        completion = assert_complete(
+            bash, "scp local_path_1-", cwd=tmpdir_mkfifo
+        )
+        assert completion == "pipe"