diff options
-rw-r--r-- | lib/spack/spack/cmd/commands.py | 4 | ||||
-rw-r--r-- | lib/spack/spack/test/cmd/commands.py | 5 | ||||
-rwxr-xr-x | share/spack/bash/spack-completion.bash (renamed from share/spack/bash/spack-completion.in) | 2 | ||||
-rw-r--r-- | share/spack/fish/spack-completion.fish (renamed from share/spack/fish/spack-completion.in) | 2 | ||||
-rwxr-xr-x | share/spack/spack-completion.bash | 2 | ||||
-rwxr-xr-x | share/spack/spack-completion.fish | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/lib/spack/spack/cmd/commands.py b/lib/spack/spack/cmd/commands.py index a65031387d..61be25f036 100644 --- a/lib/spack/spack/cmd/commands.py +++ b/lib/spack/spack/cmd/commands.py @@ -36,13 +36,13 @@ update_completion_args: Dict[str, Dict[str, Any]] = { "bash": { "aliases": True, "format": "bash", - "header": os.path.join(spack.paths.share_path, "bash", "spack-completion.in"), + "header": os.path.join(spack.paths.share_path, "bash", "spack-completion.bash"), "update": os.path.join(spack.paths.share_path, "spack-completion.bash"), }, "fish": { "aliases": True, "format": "fish", - "header": os.path.join(spack.paths.share_path, "fish", "spack-completion.in"), + "header": os.path.join(spack.paths.share_path, "fish", "spack-completion.fish"), "update": os.path.join(spack.paths.share_path, "spack-completion.fish"), }, } diff --git a/lib/spack/spack/test/cmd/commands.py b/lib/spack/spack/test/cmd/commands.py index 7a531b4f91..5bd0e20e60 100644 --- a/lib/spack/spack/test/cmd/commands.py +++ b/lib/spack/spack/test/cmd/commands.py @@ -219,7 +219,8 @@ def test_fish_completion(): def test_update_completion_arg(shell, tmpdir, monkeypatch): """Test the update completion flag.""" - mock_infile = tmpdir.join("spack-completion.in") + tmpdir.join(shell).mkdir() + mock_infile = tmpdir.join(shell).join(f"spack-completion.{shell}") mock_outfile = tmpdir.join(f"spack-completion.{shell}") mock_args = { @@ -267,7 +268,7 @@ def test_updated_completion_scripts(shell, tmpdir): "and adding the changed files to your pull request." ) - header = os.path.join(spack.paths.share_path, shell, "spack-completion.in") + header = os.path.join(spack.paths.share_path, shell, f"spack-completion.{shell}") script = "spack-completion.{0}".format(shell) old_script = os.path.join(spack.paths.share_path, script) new_script = str(tmpdir.join(script)) diff --git a/share/spack/bash/spack-completion.in b/share/spack/bash/spack-completion.bash index 048c865649..0d740101fa 100755 --- a/share/spack/bash/spack-completion.in +++ b/share/spack/bash/spack-completion.bash @@ -7,7 +7,7 @@ # NOTE: spack-completion.bash is auto-generated by: # # $ spack commands --aliases --format=bash -# --header=bash/spack-completion.in --update=spack-completion.bash +# --header=bash/spack-completion.bash --update=spack-completion.bash # # Please do not manually modify this file. diff --git a/share/spack/fish/spack-completion.in b/share/spack/fish/spack-completion.fish index f08c8b1f11..ee06dade57 100644 --- a/share/spack/fish/spack-completion.in +++ b/share/spack/fish/spack-completion.fish @@ -6,7 +6,7 @@ # NOTE: spack-completion.fish is auto-generated by: # # $ spack commands --aliases --format=fish -# --header=fish/spack-completion.in --update=spack-completion.fish +# --header=fish/spack-completion.fish --update=spack-completion.fish # # Please do not manually modify this file. diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index 9e184aa9a7..f504bea390 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -7,7 +7,7 @@ # NOTE: spack-completion.bash is auto-generated by: # # $ spack commands --aliases --format=bash -# --header=bash/spack-completion.in --update=spack-completion.bash +# --header=bash/spack-completion.bash --update=spack-completion.bash # # Please do not manually modify this file. diff --git a/share/spack/spack-completion.fish b/share/spack/spack-completion.fish index 9b4027dfe3..d743cf0f52 100755 --- a/share/spack/spack-completion.fish +++ b/share/spack/spack-completion.fish @@ -6,7 +6,7 @@ # NOTE: spack-completion.fish is auto-generated by: # # $ spack commands --aliases --format=fish -# --header=fish/spack-completion.in --update=spack-completion.fish +# --header=fish/spack-completion.fish --update=spack-completion.fish # # Please do not manually modify this file. |