small linting fixes

This commit is contained in:
Jaromil 2017-01-02 06:13:52 +01:00
parent 0fa4a07f8c
commit cb699189e7

9
tomb
View File

@ -478,7 +478,8 @@ EOF`
[[ "$i" =~ "^ERR.*" ]] && { [[ "$i" =~ "^ERR.*" ]] && {
_warning "Pinentry error: ::1 error::" ${i[(w)3]} _warning "Pinentry error: ::1 error::" ${i[(w)3]}
print "canceled" print "canceled"
return 1 } return 1
}
# here the password is found # here the password is found
[[ "$i" =~ "^D .*" ]] && password="${i##D }"; [[ "$i" =~ "^D .*" ]] && password="${i##D }";
@ -487,7 +488,8 @@ EOF`
[[ "$password" = "" ]] && { [[ "$password" = "" ]] && {
_warning "Empty password" _warning "Empty password"
print "empty" print "empty"
return 1 } return 1
}
print "$password" print "$password"
return 0 return 0
@ -792,8 +794,7 @@ _list_optional_tools() {
_ensure_dependencies() { _ensure_dependencies() {
# Check for required programs # Check for required programs
local deps=(cryptsetup pinentry sudo gpg mkfs.ext4 e2fsck) for req in cryptsetup pinentry sudo gpg mkfs.ext4 e2fsck; do
for req in $deps; do
command -v $req 1>/dev/null 2>/dev/null || { command -v $req 1>/dev/null 2>/dev/null || {
_failure "Missing required dependency ::1 command::. Please install it." $req; } _failure "Missing required dependency ::1 command::. Please install it." $req; }
done done