diff --git a/Cargo.lock b/Cargo.lock index 9ae758b..a2b47d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "client" -version = "1.5.3-beta.5" +version = "1.5.3" dependencies = [ "anyhow", "clap", @@ -638,7 +638,7 @@ dependencies = [ [[package]] name = "netlink-request" -version = "1.5.3-beta.5" +version = "1.5.3" dependencies = [ "netlink-packet-core", "netlink-packet-generic", @@ -924,7 +924,7 @@ dependencies = [ [[package]] name = "server" -version = "1.5.3-beta.5" +version = "1.5.3" dependencies = [ "anyhow", "bytes", @@ -959,7 +959,7 @@ dependencies = [ [[package]] name = "shared" -version = "1.5.3-beta.5" +version = "1.5.3" dependencies = [ "anyhow", "atty", @@ -1333,7 +1333,7 @@ checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" [[package]] name = "wireguard-control" -version = "1.5.3-beta.5" +version = "1.5.3" dependencies = [ "base64", "curve25519-dalek", diff --git a/README.md b/README.md index c92943c..7852e92 100644 --- a/README.md +++ b/README.md @@ -214,10 +214,10 @@ brew install tonarino/innernet/innernet ```sh # to install innernet: -cargo install --git https://github.com/tonarino/innernet --tag v1.5.3-beta.5 client +cargo install --git https://github.com/tonarino/innernet --tag v1.5.3 client # to install innernet-server: -cargo install --git https://github.com/tonarino/innernet --tag v1.5.3-beta.5 server +cargo install --git https://github.com/tonarino/innernet --tag v1.5.3 server ``` Note that you'll be responsible for updating manually. diff --git a/client/Cargo.toml b/client/Cargo.toml index 7827846..9eb7376 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT" name = "client" publish = false repository = "https://github.com/tonarino/innernet" -version = "1.5.3-beta.5" +version = "1.5.3" [[bin]] name = "innernet" diff --git a/doc/innernet-server.8 b/doc/innernet-server.8 index 924dac0..c794905 100644 --- a/doc/innernet-server.8 +++ b/doc/innernet-server.8 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH INNERNET-SERVER "8" "January 2022" "innernet-server 1.5.3-beta.5" "System Administration Utilities" +.TH INNERNET-SERVER "8" "February 2022" "innernet-server 1.5.3" "System Administration Utilities" .SH NAME -innernet-server \- manual page for innernet-server 1.5.3-beta.5 +innernet-server \- manual page for innernet-server 1.5.3 .SH DESCRIPTION -innernet\-server 1.5.3\-beta.5 +innernet\-server 1.5.3 Jake McGinty A server to coordinate innernet networks. .SS "USAGE:" diff --git a/doc/innernet-server.8.gz b/doc/innernet-server.8.gz index 814af90..a995d72 100644 Binary files a/doc/innernet-server.8.gz and b/doc/innernet-server.8.gz differ diff --git a/doc/innernet.8 b/doc/innernet.8 index 3fe49a8..799e1b7 100644 --- a/doc/innernet.8 +++ b/doc/innernet.8 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH INNERNET "8" "January 2022" "innernet 1.5.3-beta.5" "System Administration Utilities" +.TH INNERNET "8" "February 2022" "innernet 1.5.3" "System Administration Utilities" .SH NAME -innernet \- manual page for innernet 1.5.3-beta.5 +innernet \- manual page for innernet 1.5.3 .SH DESCRIPTION -innernet 1.5.3\-beta.5 +innernet 1.5.3 Jake McGinty A client to manage innernet network interfaces. .SS "USAGE:" diff --git a/doc/innernet.8.gz b/doc/innernet.8.gz index d28465a..2d5f20a 100644 Binary files a/doc/innernet.8.gz and b/doc/innernet.8.gz differ diff --git a/doc/innernet.completions.bash b/doc/innernet.completions.bash index 2eaa22c..d25d6c2 100644 --- a/doc/innernet.completions.bash +++ b/doc/innernet.completions.bash @@ -117,7 +117,7 @@ _innernet() { return 0 ;; innernet__add__association) - opts="-h --help " + opts="-h --yes --help " if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 @@ -209,7 +209,7 @@ _innernet() { return 0 ;; innernet__delete__association) - opts="-h --help " + opts="-h --yes --help " if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 @@ -453,7 +453,7 @@ _innernet() { return 0 ;; innernet__uninstall) - opts="-h --help " + opts="-h --yes --help " if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/doc/innernet.completions.elvish b/doc/innernet.completions.elvish index 06322b0..6416427 100644 --- a/doc/innernet.completions.elvish +++ b/doc/innernet.completions.elvish @@ -95,6 +95,7 @@ set edit:completion:arg-completer[innernet] = {|@words| cand --help 'Print help information' } &'innernet;uninstall'= { + cand --yes 'Bypass confirmation' cand -h 'Print help information' cand --help 'Print help information' } @@ -150,10 +151,12 @@ set edit:completion:arg-completer[innernet] = {|@words| cand --help 'Print help information' } &'innernet;add-association'= { + cand --yes 'Bypass confirmation' cand -h 'Print help information' cand --help 'Print help information' } &'innernet;delete-association'= { + cand --yes 'Bypass confirmation' cand -h 'Print help information' cand --help 'Print help information' } diff --git a/doc/innernet.completions.fish b/doc/innernet.completions.fish index df15ec0..124bbdb 100644 --- a/doc/innernet.completions.fish +++ b/doc/innernet.completions.fish @@ -52,6 +52,7 @@ complete -c innernet -n "__fish_seen_subcommand_from fetch" -l no-write-hosts -d complete -c innernet -n "__fish_seen_subcommand_from fetch" -l no-nat-traversal -d 'Don\'t attempt NAT traversal. Note that this still will report candidates unless you also specify to exclude all NAT candidates' complete -c innernet -n "__fish_seen_subcommand_from fetch" -l no-nat-candidates -d 'Don\'t report any candidates to coordinating server. Shorthand for --exclude-nat-candidates \'0.0.0.0/0\'' complete -c innernet -n "__fish_seen_subcommand_from fetch" -s h -l help -d 'Print help information' +complete -c innernet -n "__fish_seen_subcommand_from uninstall" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from uninstall" -s h -l help -d 'Print help information' complete -c innernet -n "__fish_seen_subcommand_from down" -s h -l help -d 'Print help information' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l name -d 'Name of new peer' -r @@ -79,7 +80,9 @@ complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s t -l tree -d complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s h -l help -d 'Print help information' complete -c innernet -n "__fish_seen_subcommand_from disable-peer" -s h -l help -d 'Print help information' complete -c innernet -n "__fish_seen_subcommand_from enable-peer" -s h -l help -d 'Print help information' +complete -c innernet -n "__fish_seen_subcommand_from add-association" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from add-association" -s h -l help -d 'Print help information' +complete -c innernet -n "__fish_seen_subcommand_from delete-association" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from delete-association" -s h -l help -d 'Print help information' complete -c innernet -n "__fish_seen_subcommand_from list-associations" -s h -l help -d 'Print help information' complete -c innernet -n "__fish_seen_subcommand_from set-listen-port" -s l -l listen-port -d 'The listen port you\'d like to set for the interface' -r diff --git a/doc/innernet.completions.powershell b/doc/innernet.completions.powershell index 7f59953..8b703fa 100644 --- a/doc/innernet.completions.powershell +++ b/doc/innernet.completions.powershell @@ -102,6 +102,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock { break } 'innernet;uninstall' { + [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help information') break @@ -166,11 +167,13 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock { break } 'innernet;add-association' { + [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help information') break } 'innernet;delete-association' { + [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help information') break diff --git a/doc/innernet.completions.zsh b/doc/innernet.completions.zsh index 9a47027..854d3e4 100644 --- a/doc/innernet.completions.zsh +++ b/doc/innernet.completions.zsh @@ -93,6 +93,7 @@ _arguments "${_arguments_options[@]}" \ ;; (uninstall) _arguments "${_arguments_options[@]}" \ +'--yes[Bypass confirmation]' \ '-h[Print help information]' \ '--help[Print help information]' \ ':interface:' \ @@ -175,6 +176,7 @@ _arguments "${_arguments_options[@]}" \ ;; (add-association) _arguments "${_arguments_options[@]}" \ +'--yes[Bypass confirmation]' \ '-h[Print help information]' \ '--help[Print help information]' \ ':interface:' \ @@ -184,9 +186,12 @@ _arguments "${_arguments_options[@]}" \ ;; (delete-association) _arguments "${_arguments_options[@]}" \ +'--yes[Bypass confirmation]' \ '-h[Print help information]' \ '--help[Print help information]' \ ':interface:' \ +'::cidr1 -- The first cidr to associate:' \ +'::cidr2 -- The second cidr to associate:' \ && ret=0 ;; (list-associations) diff --git a/netlink-request/Cargo.toml b/netlink-request/Cargo.toml index ca227ae..ae49147 100644 --- a/netlink-request/Cargo.toml +++ b/netlink-request/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netlink-request" -version = "1.5.3-beta.5" +version = "1.5.3" edition = "2021" [target.'cfg(target_os = "linux")'.dependencies] diff --git a/server/Cargo.toml b/server/Cargo.toml index 2f59623..db50e32 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" name = "server" publish = false readme = "README.md" -version = "1.5.3-beta.5" +version = "1.5.3" [[bin]] name = "innernet-server" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index f5508a4..91c057e 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "shared" publish = false -version = "1.5.3-beta.5" +version = "1.5.3" [dependencies] anyhow = "1" diff --git a/wireguard-control/Cargo.toml b/wireguard-control/Cargo.toml index 7b8188e..753abe3 100644 --- a/wireguard-control/Cargo.toml +++ b/wireguard-control/Cargo.toml @@ -7,7 +7,7 @@ license = "LGPL-2.1-or-later" name = "wireguard-control" readme = "README.md" repository = "https://github.com/tonarino/innernet" -version = "1.5.3-beta.5" +version = "1.5.3" [dependencies] base64 = "0.13"