Skip to content

Commit 34f21c8

Browse files
nadzyahJohnAZoidberg
nadzyah
authored and
JohnAZoidberg
committed
completions: Move to framework_tool/ to include in crates.io release
Update asset paths in Cargo.toml metadata (deb and rpm), the CI completions check, and the README regeneration instructions accordingly
1 parent 978f1ce commit 34f21c8

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ jobs:
204204
./target/debug/framework_tool --generate-completions bash > /tmp/bash_completions
205205
./target/debug/framework_tool --generate-completions zsh > /tmp/zsh_completions
206206
./target/debug/framework_tool --generate-completions fish > /tmp/fish_completions
207-
diff completions/bash/framework_tool /tmp/bash_completions || { echo "Shell completions are out of date. See completions/README.md for regeneration instructions."; exit 1; }
208-
diff completions/zsh/_framework_tool /tmp/zsh_completions || { echo "Shell completions are out of date. See completions/README.md for regeneration instructions."; exit 1; }
209-
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; }
207+
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; }
208+
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; }
209+
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; }
210210
211211
# Just make sure doc generation works
212212
doc:

‎framework_tool/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ priority = "optional"
4444
features = ["nvidia"]
4545
assets = [
4646
["target/release/framework_tool", "usr/bin/", "755"],
47-
["../completions/bash/framework_tool", "usr/share/bash-completion/completions/framework_tool", "644"],
48-
["../completions/zsh/_framework_tool", "usr/share/zsh/site-functions/_framework_tool", "644"],
49-
["../completions/fish/framework_tool.fish", "usr/share/fish/vendor_completions.d/framework_tool.fish", "644"],
47+
["completions/bash/framework_tool", "usr/share/bash-completion/completions/framework_tool", "644"],
48+
["completions/zsh/_framework_tool", "usr/share/zsh/site-functions/_framework_tool", "644"],
49+
["completions/fish/framework_tool.fish", "usr/share/fish/vendor_completions.d/framework_tool.fish", "644"],
5050
["../LICENSE.md", "usr/share/doc/framework-tool/LICENSE.md", "644"],
5151
["../README.md", "usr/share/doc/framework-tool/README.md", "644"],
5252
]
5353

5454
[package.metadata.generate-rpm]
5555
assets = [
5656
{ source = "target/release/framework_tool", dest = "/usr/bin/framework_tool", mode = "755" },
57-
{ source = "../completions/bash/framework_tool", dest = "/usr/share/bash-completion/completions/framework_tool", mode = "644" },
58-
{ source = "../completions/zsh/_framework_tool", dest = "/usr/share/zsh/site-functions/_framework_tool", mode = "644" },
59-
{ source = "../completions/fish/framework_tool.fish", dest = "/usr/share/fish/vendor_completions.d/framework_tool.fish", mode = "644" },
57+
{ source = "completions/bash/framework_tool", dest = "/usr/share/bash-completion/completions/framework_tool", mode = "644" },
58+
{ source = "completions/zsh/_framework_tool", dest = "/usr/share/zsh/site-functions/_framework_tool", mode = "644" },
59+
{ source = "completions/fish/framework_tool.fish", dest = "/usr/share/fish/vendor_completions.d/framework_tool.fish", mode = "644" },
6060
{ source = "../LICENSE.md", dest = "/usr/share/doc/framework-tool/LICENSE.md", mode = "644", doc = true },
6161
{ source = "../README.md", dest = "/usr/share/doc/framework-tool/README.md", mode = "644", doc = true },
6262
]

completions/README.md renamed to framework_tool/completions/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ If you modify the CLI arguments, regenerate completions:
88

99
```bash
1010
cargo build
11-
./target/debug/framework_tool --generate-completions bash > completions/bash/framework_tool
12-
./target/debug/framework_tool --generate-completions zsh > completions/zsh/_framework_tool
13-
./target/debug/framework_tool --generate-completions fish > completions/fish/framework_tool.fish
11+
./target/debug/framework_tool --generate-completions bash > framework_tool/completions/bash/framework_tool
12+
./target/debug/framework_tool --generate-completions zsh > framework_tool/completions/zsh/_framework_tool
13+
./target/debug/framework_tool --generate-completions fish > framework_tool/completions/fish/framework_tool.fish
1414
```
1515

1616
## Testing
@@ -20,21 +20,21 @@ cargo build
2020
**Bash:**
2121
```bash
2222
export PATH="$PWD/target/debug:$PATH"
23-
source completions/bash/framework_tool
23+
source framework_tool/completions/bash/framework_tool
2424
framework_tool --<TAB>
2525
```
2626

2727
**Zsh:**
2828
```zsh
2929
export PATH="$PWD/target/debug:$PATH"
30-
source completions/zsh/_framework_tool
30+
source framework_tool/completions/zsh/_framework_tool
3131
framework_tool --<TAB>
3232
```
3333

3434
**Fish:**
3535
```fish
3636
fish_add_path $PWD/target/debug
37-
source completions/fish/framework_tool.fish
37+
source framework_tool/completions/fish/framework_tool.fish
3838
framework_tool --<TAB>
3939
```
4040

completions/bash/framework_tool renamed to framework_tool/completions/bash/framework_tool

File renamed without changes.

completions/fish/framework_tool.fish renamed to framework_tool/completions/fish/framework_tool.fish

File renamed without changes.

completions/zsh/_framework_tool renamed to framework_tool/completions/zsh/_framework_tool

File renamed without changes.

0 commit comments

Comments
 (0)