Skip to content

Use array for default users #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blueyed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use array for default users #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ clip_clear=45
# open new password entries in editor
edit_new_pass="true"

# default_user is also used for password files that have no user field.
#default_user="${ROFI_PASS_DEFAULT_USER-$(whoami)}"
#default_user2=mary_ann
# The first entry from default_users is also used for password files that have
# no user field.
#default_users=("${ROFI_PASS_DEFAULT_USER-$(whoami)}")
#password_length=12

# Custom Keybindings
Expand Down
38 changes: 25 additions & 13 deletions rofi-pass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ notify='false'
help_color=""
clip=primary
clip_clear=45
default_user="${ROFI_PASS_DEFAULT_USER-$(whoami)}"
default_user2=john_doe
default_users=("${ROFI_PASS_DEFAULT_USER-$(whoami)}")
password_length=12
fix_layout=false

Expand Down Expand Up @@ -419,12 +418,12 @@ mainMenu () {
fi
fi
if [[ -z "${stuff["${USERNAME_field}"]}" ]]; then
if [[ -n $default_user ]]; then
if [[ "$default_user" == ":filename" ]]; then
stuff["${USERNAME_field}"]="$(basename $selected_password)"
else
stuff["${USERNAME_field}"]="${default_user}"
fi
if [[ -n ${default_users[0]} ]]; then
if [[ "${default_users[0]}" == ":filename" ]]; then
stuff["${USERNAME_field}"]="$(basename $selected_password)"
else
stuff["${USERNAME_field}"]="${default_users[0]}"
fi
fi
fi
pass_content="$(for key in "${!stuff[@]}"; do printf '%s\n' "${key}: ${stuff[$key]}"; done)"
Expand Down Expand Up @@ -691,11 +690,7 @@ insertPass () {
exit
fi

user_content=("${default_user2}"
"${USER}"
"${default_user}")

user=$(printf '%s\n' "${user_content[@]}" | _rofi -dmenu -mesg "Chose Username or type" -p "> ")
user=$(printf '%s\n' "${default_users[@]}" | _rofi -dmenu -mesg "Chose Username or type" -p "> ")
val=$?

if [[ $val -eq 1 ]]; then
Expand Down Expand Up @@ -792,6 +787,23 @@ main () {
config_file="$(get_config_file)"
[[ ! -z "$config_file" ]] && source "$config_file"

# Handle deprecated default_user/default_user2 config.
if [[ -z "${default_users[*]}" ]]; then
# shellcheck disable=SC2154
if [[ -n "$default_user" ]]; then
default_users+=("$default_user")
fi
# shellcheck disable=SC2154
if [[ -n "$default_user2" ]]; then
default_users+=("$default_user2")
fi
if [[ ${#default_users[@]} -eq 0 ]]; then
default_users=("$USER")
fi
else
default_users=("$USER")
fi

# create tmp dir
if [[ ! -d "$HOME/.cache/rofi-pass" ]]; then
mkdir "$HOME/.cache/rofi-pass"
Expand Down