Compare commits

..

2 commits

Author SHA1 Message Date
6dc0cd6d16
Fix regression for username fallback
While usernames were now picked up correctly as a fallback from the
filename if none were present in the fields themselves, if there were
any in the fields the program would return an empty string.

This fixes it for both cases, the username existing in the entry fields
or only in the filename. Entry fields will still take precedence.
2022-01-11 17:50:24 +01:00
2236d7fec8
Reformat file 2022-01-11 17:47:30 +01:00

View file

@ -101,7 +101,7 @@ get_config() {
# return the first config file with a valid path # return the first config file with a valid path
for config in "${locations[@]}"; do for config in "${locations[@]}"; do
if [[ -n "$config" && -f "$config" ]]; then if [[ -n $config && -f $config ]]; then
# see if the config has been given a value # see if the config has been given a value
local val local val
val="$(_parse_config "$config" "$1")" val="$(_parse_config "$config" "$1")"
@ -208,6 +208,8 @@ show_username() {
result=$(_p_get_field "$1" "${PASS_USERNAME_FIELD}") result=$(_p_get_field "$1" "${PASS_USERNAME_FIELD}")
if [ -z "$result" ]; then if [ -z "$result" ]; then
echo "${1##*/}" echo "${1##*/}"
else
echo "$result"
fi fi
} }
@ -285,8 +287,8 @@ entrymenu() {
local field local field
field=$( field=$(
printf "password: %s\n%s" "$pass" "$(list_fields "$entry")" | printf "password: %s\n%s" "$pass" "$(list_fields "$entry")" \
_picker \ | _picker \
-kb-accept-entry "" \ -kb-accept-entry "" \
-kb-custom-1 "$k_entrymenu_fill" \ -kb-custom-1 "$k_entrymenu_fill" \
-kb-custom-2 "$k_entrymenu_clip" \ -kb-custom-2 "$k_entrymenu_clip" \
@ -363,8 +365,8 @@ main() {
open_coffin open_coffin
entry="$( entry="$(
list_passwords | list_passwords \
_picker -kb-accept-entry "" \ | _picker -kb-accept-entry "" \
-kb-custom-1 "$k_autofill" \ -kb-custom-1 "$k_autofill" \
-kb-custom-2 "$k_clip_user" \ -kb-custom-2 "$k_clip_user" \
-kb-custom-3 "$k_clip_pass" \ -kb-custom-3 "$k_clip_pass" \