diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69543f6..4f2f327 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -204,9 +204,9 @@ jobs: ./target/debug/framework_tool --generate-completions bash > /tmp/bash_completions ./target/debug/framework_tool --generate-completions zsh > /tmp/zsh_completions ./target/debug/framework_tool --generate-completions fish > /tmp/fish_completions - diff completions/bash/framework_tool /tmp/bash_completions || { echo "Shell completions are out of date. See completions/README.md for regeneration instructions."; exit 1; } - diff completions/zsh/_framework_tool /tmp/zsh_completions || { echo "Shell completions are out of date. See completions/README.md for regeneration instructions."; exit 1; } - diff completions/fish/framework_tool.fish /tmp/fish_completions || { echo "Shell completions are out of date. See completions/README.md for regeneration instructions."; exit 1; } + diff framework_tool/completions/bash/framework_tool /tmp/bash_completions || { echo "Shell completions are out of date. See framework_tool/completions/README.md for regeneration instructions."; exit 1; } + diff framework_tool/completions/zsh/_framework_tool /tmp/zsh_completions || { echo "Shell completions are out of date. See framework_tool/completions/README.md for regeneration instructions."; exit 1; } + diff framework_tool/completions/fish/framework_tool.fish /tmp/fish_completions || { echo "Shell completions are out of date. See framework_tool/completions/README.md for regeneration instructions."; exit 1; } # Just make sure doc generation works doc: diff --git a/framework_tool/Cargo.toml b/framework_tool/Cargo.toml index 51812b5..ae81ea8 100644 --- a/framework_tool/Cargo.toml +++ b/framework_tool/Cargo.toml @@ -44,9 +44,9 @@ priority = "optional" features = ["nvidia"] assets = [ ["target/release/framework_tool", "usr/bin/", "755"], - ["../completions/bash/framework_tool", "usr/share/bash-completion/completions/framework_tool", "644"], - ["../completions/zsh/_framework_tool", "usr/share/zsh/site-functions/_framework_tool", "644"], - ["../completions/fish/framework_tool.fish", "usr/share/fish/vendor_completions.d/framework_tool.fish", "644"], + ["completions/bash/framework_tool", "usr/share/bash-completion/completions/framework_tool", "644"], + ["completions/zsh/_framework_tool", "usr/share/zsh/site-functions/_framework_tool", "644"], + ["completions/fish/framework_tool.fish", "usr/share/fish/vendor_completions.d/framework_tool.fish", "644"], ["../LICENSE.md", "usr/share/doc/framework-tool/LICENSE.md", "644"], ["../README.md", "usr/share/doc/framework-tool/README.md", "644"], ] @@ -54,9 +54,9 @@ assets = [ [package.metadata.generate-rpm] assets = [ { source = "target/release/framework_tool", dest = "/usr/bin/framework_tool", mode = "755" }, - { source = "../completions/bash/framework_tool", dest = "/usr/share/bash-completion/completions/framework_tool", mode = "644" }, - { source = "../completions/zsh/_framework_tool", dest = "/usr/share/zsh/site-functions/_framework_tool", mode = "644" }, - { source = "../completions/fish/framework_tool.fish", dest = "/usr/share/fish/vendor_completions.d/framework_tool.fish", mode = "644" }, + { source = "completions/bash/framework_tool", dest = "/usr/share/bash-completion/completions/framework_tool", mode = "644" }, + { source = "completions/zsh/_framework_tool", dest = "/usr/share/zsh/site-functions/_framework_tool", mode = "644" }, + { source = "completions/fish/framework_tool.fish", dest = "/usr/share/fish/vendor_completions.d/framework_tool.fish", mode = "644" }, { source = "../LICENSE.md", dest = "/usr/share/doc/framework-tool/LICENSE.md", mode = "644", doc = true }, { source = "../README.md", dest = "/usr/share/doc/framework-tool/README.md", mode = "644", doc = true }, ] diff --git a/completions/README.md b/framework_tool/completions/README.md similarity index 62% rename from completions/README.md rename to framework_tool/completions/README.md index c957a12..78350a2 100644 --- a/completions/README.md +++ b/framework_tool/completions/README.md @@ -8,9 +8,9 @@ If you modify the CLI arguments, regenerate completions: ```bash cargo build -./target/debug/framework_tool --generate-completions bash > completions/bash/framework_tool -./target/debug/framework_tool --generate-completions zsh > completions/zsh/_framework_tool -./target/debug/framework_tool --generate-completions fish > completions/fish/framework_tool.fish +./target/debug/framework_tool --generate-completions bash > framework_tool/completions/bash/framework_tool +./target/debug/framework_tool --generate-completions zsh > framework_tool/completions/zsh/_framework_tool +./target/debug/framework_tool --generate-completions fish > framework_tool/completions/fish/framework_tool.fish ``` ## Testing @@ -20,21 +20,21 @@ cargo build **Bash:** ```bash export PATH="$PWD/target/debug:$PATH" -source completions/bash/framework_tool +source framework_tool/completions/bash/framework_tool framework_tool -- ``` **Zsh:** ```zsh export PATH="$PWD/target/debug:$PATH" -source completions/zsh/_framework_tool +source framework_tool/completions/zsh/_framework_tool framework_tool -- ``` **Fish:** ```fish fish_add_path $PWD/target/debug -source completions/fish/framework_tool.fish +source framework_tool/completions/fish/framework_tool.fish framework_tool -- ``` diff --git a/completions/bash/framework_tool b/framework_tool/completions/bash/framework_tool similarity index 100% rename from completions/bash/framework_tool rename to framework_tool/completions/bash/framework_tool diff --git a/completions/fish/framework_tool.fish b/framework_tool/completions/fish/framework_tool.fish similarity index 100% rename from completions/fish/framework_tool.fish rename to framework_tool/completions/fish/framework_tool.fish diff --git a/completions/zsh/_framework_tool b/framework_tool/completions/zsh/_framework_tool similarity index 100% rename from completions/zsh/_framework_tool rename to framework_tool/completions/zsh/_framework_tool