vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-06 19:40:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

[yabridgectl] Update clap to the final 3.0 release

Browse Source
This commit is contained in:
Robbert van der Helm
2022-01-12 13:43:31 +01:00
parent 4767b758b8
commit 8382384fc1
3 changed files with 25 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/Cargo.lock
Generated
+7 -65
View File
@@ -60,13 +60,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "3.0.0-beta.4"
version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
checksum = "1957aa4a5fb388f0a0a73ce7556c5b42025b874e5cdc2c670775e346e97adec0"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"indexmap",
"lazy_static",
"os_str_bytes",
@@ -74,20 +73,6 @@ dependencies = [
"termcolor",
"terminal_size",
"textwrap 0.14.2",
"vec_map",
]
[[package]]
name = "clap_derive"
version = "3.0.0-beta.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@@ -190,15 +175,6 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "heck"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
version = "0.1.18"
@@ -250,9 +226,9 @@ dependencies = [
[[package]]
name = "memchr"
version = "2.3.4"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
[[package]]
name = "memoffset"
@@ -287,32 +263,11 @@ dependencies = [
[[package]]
name = "os_str_bytes"
version = "3.1.0"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
"version_check",
"memchr",
]
[[package]]
@@ -509,7 +464,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
dependencies = [
"terminal_size",
"unicode-width",
]
[[package]]
@@ -545,18 +499,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "walkdir"
version = "2.3.2"
tools/yabridgectl/Cargo.toml
+1 -1
View File
@@ -12,7 +12,7 @@ license = "GPL-3.0-or-later"
[dependencies]
aho-corasick = "0.7.13"
anyhow = "1.0.31"
clap = { version = "3.0.0-beta.4", features = ["wrap_help"] }
clap = { version = "3.0.6", features = ["cargo", "env", "wrap_help"] }
colored = "2.0.0"
is_executable = "0.1.2"
lazy_static = "1.4.0"
tools/yabridgectl/src/main.rs
+17 -17
View File
@@ -60,7 +60,7 @@ fn main() -> Result<()> {
.display_order(1)
.arg(
Arg::new("path")
.about("Path to a directory containing Windows VST plugins")
.help("Path to a directory containing Windows VST plugins")
.validator(validate_path)
.takes_value(true)
.required(true),
@@ -72,7 +72,7 @@ fn main() -> Result<()> {
.display_order(2)
.arg(
Arg::new("path")
.about("Path to a previously added directory")
.help("Path to a previously added directory")
.validator(|path| match_in_path_list(Path::new(path), &plugin_directories))
.takes_value(true)
.required(true),
@@ -96,25 +96,25 @@ fn main() -> Result<()> {
Arg::new("force")
.short('f')
.long("force")
.about("Always update files, even not necessary"),
.help("Always update files, even not necessary"),
)
.arg(
Arg::new("no-verify")
.short('n')
.long("no-verify")
.about("Skip post-installation setup checks"),
.help("Skip post-installation setup checks"),
)
.arg(
Arg::new("prune")
.short('p')
.long("prune")
.about("Remove unrelated or leftover .so files"),
.help("Remove unrelated or leftover .so files"),
)
.arg(
Arg::new("verbose")
.short('v')
.long("verbose")
.about("Print information about plugins being set up or skipped"),
.help("Print information about plugins being set up or skipped"),
),
)
.subcommand(
@@ -125,8 +125,8 @@ fn main() -> Result<()> {
.arg(
Arg::new("method")
.long("method")
.about("The installation method to use (deprecated)")
.long_about(&format!(
.help("The installation method to use (deprecated)")
.long_help(format!(
"This feature has been deprecated in yabridgectl 3.8.0 and should \
not be used anymore. \
\n\n\
@@ -140,7 +140,7 @@ fn main() -> Result<()> {
variables or to manual updates.",
"copy".bright_white(),
"symlink".bright_white()
))
).as_ref())
.setting(clap::ArgSettings::NextLineHelp)
.possible_values(&["copy", "symlink"])
.takes_value(true),
@@ -148,8 +148,8 @@ fn main() -> Result<()> {
.arg(
Arg::new("path")
.long("path")
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
.long_about(
.help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
.long_help(
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \
is not set, then yabridgectl will look in both '/usr/lib' and \
'~/.local/share/yabridge' by default.",
@@ -160,8 +160,8 @@ fn main() -> Result<()> {
.arg(
Arg::new("path_auto")
.long("path-auto")
.about("Automatically locate yabridge's files")
.long_about(
.help("Automatically locate yabridge's files")
.long_help(
"Automatically locate yabridge's files. This can be used after manually \
setting a path with the '--path' option to revert back to the default \
auto detection behaviour.",
@@ -169,8 +169,8 @@ fn main() -> Result<()> {
).arg(
Arg::new("no_verify")
.long("no-verify")
.about("Always skip post-installation setup checks")
.long_about(
.help("Always skip post-installation setup checks")
.long_help(
"Always skip post-installation setup checks. This can be set temporarily \
by passing the '--no-verify' option to 'yabridgectl sync'.",
)
@@ -195,7 +195,7 @@ fn main() -> Result<()> {
.display_order(1)
.arg(
Arg::new("path")
.about("Path to a file or a directory")
.help("Path to a file or a directory")
.validator(validate_path)
.takes_value(true)
.required(true),
@@ -207,7 +207,7 @@ fn main() -> Result<()> {
.display_order(2)
.arg(
Arg::new("path")
.about("Path to a previously added file or directory")
.help("Path to a previously added file or directory")
.validator(|path| match_in_path_list(Path::new(path), &blacklist_entries))
.validator(validate_path)
.takes_value(true)