Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
03ef5721e0
|
|||
008e644024
|
|||
e1f762ddc9
|
|||
![]() |
2266754a95 |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -377,7 +377,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fido2luks"
|
name = "fido2luks"
|
||||||
version = "0.2.12"
|
version = "0.2.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ctap_hmac",
|
"ctap_hmac",
|
||||||
"failure",
|
"failure",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "fido2luks"
|
name = "fido2luks"
|
||||||
version = "0.2.12"
|
version = "0.2.13"
|
||||||
authors = ["shimunn <shimun@shimun.net>"]
|
authors = ["shimunn <shimun@shimun.net>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
26
PKGBUILD
Normal file
26
PKGBUILD
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
# Maintainer: shimunn <shimun@shimun.net>
|
||||||
|
pkgname=fido2luks
|
||||||
|
pkgver=0.2.12
|
||||||
|
pkgrel=1
|
||||||
|
makedepends=('rust' 'cargo' 'cryptsetup' 'clang')
|
||||||
|
depends=('cryptsetup')
|
||||||
|
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
||||||
|
pkgdesc="Decrypt your LUKS partition using a FIDO2 compatible authenticator"
|
||||||
|
url="https://github.com/shimunn/fido2luks"
|
||||||
|
license=('MPL-2.0')
|
||||||
|
|
||||||
|
pkgver() {
|
||||||
|
# Use tag version if possible otherwise concat project version and git ref
|
||||||
|
git describe --exact-match --tags HEAD 2> /dev/null || \
|
||||||
|
echo "$(cargo pkgid | cut -d'#' -f2).$(git describe --always)"
|
||||||
|
}
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cargo build --release --locked --all-features --target-dir=target
|
||||||
|
./target/release/fido2luks completions bash target
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
install -Dm 755 target/release/${pkgname} -t "${pkgdir}/usr/bin"
|
||||||
|
install -Dm 644 target/fido2luks.bash "${pkgdir}/usr/share/bash-completion/completions/fido2luks"
|
||||||
|
}
|
21
src/cli.rs
21
src/cli.rs
@@ -1,6 +1,7 @@
|
|||||||
use crate::error::*;
|
use crate::error::*;
|
||||||
use crate::*;
|
use crate::*;
|
||||||
|
|
||||||
|
use structopt::clap::{AppSettings, Shell};
|
||||||
use structopt::StructOpt;
|
use structopt::StructOpt;
|
||||||
|
|
||||||
use ctap::{FidoCredential, FidoErrorKind};
|
use ctap::{FidoCredential, FidoErrorKind};
|
||||||
@@ -303,6 +304,14 @@ pub enum Command {
|
|||||||
#[structopt(name = "connected")]
|
#[structopt(name = "connected")]
|
||||||
Connected,
|
Connected,
|
||||||
Token(TokenCommand),
|
Token(TokenCommand),
|
||||||
|
/// Generate bash completion scripts
|
||||||
|
#[structopt(name = "completions", setting = AppSettings::Hidden)]
|
||||||
|
GenerateCompletions {
|
||||||
|
/// Shell to generate completions for: bash, fish
|
||||||
|
#[structopt(possible_values = &["bash", "fish"])]
|
||||||
|
shell: String,
|
||||||
|
out_dir: PathBuf,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
///LUKS2 token related operations
|
///LUKS2 token related operations
|
||||||
@@ -725,5 +734,17 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Command::GenerateCompletions { shell, out_dir } => {
|
||||||
|
Args::clap().gen_completions(
|
||||||
|
env!("CARGO_PKG_NAME"),
|
||||||
|
match shell.as_ref() {
|
||||||
|
"bash" => Shell::Bash,
|
||||||
|
"fish" => Shell::Fish,
|
||||||
|
_ => unreachable!("structopt shouldn't allow us to reach this point"),
|
||||||
|
},
|
||||||
|
&out_dir,
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user