Integrate parts of #192, fixes adding passwords

carnager · Jul 2, 2020 · c63c0dd · c63c0dd
1 parent 594adc9
commit c63c0dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ in a convenient way using [rofi](https://github.com/DaveDavenport/rofi).
 * xdotool
 * gawk
 * bash 4.x
+* find
 * pwgen
 * [pass-otp](https://github.com/tadfisher/pass-otp) (optional: for OTPs)
 

diff --git a/rofi-pass b/rofi-pass
@@ -70,7 +70,7 @@ has_qrencode() {
 # get all password files and ouput as newline-delimited text
 list_passwords() {
 	cd "${root}" || exit
-	find -L * -name "*.gpg" |
+	listgpg |
 		while IFS= read pfile; do
 			echo ${pfile%.gpg}
 		done | sort -n
@@ -673,8 +673,7 @@ manageEntry () {
 }
 
 listgpg () {
-	pw_list=(**/*.gpg)
-	printf '%s\n' "${pw_list[@]}" | sort -n
+	find -L * -name "*.gpg" | sort -n
 }
 
 insertPass () {
@@ -793,9 +792,6 @@ get_config_file () {
 }
 
 main () {
-	# enable extended globbing
-	shopt -s nullglob globstar
-
 	# load config file
 	config_file="$(get_config_file)"
 	[[ ! -z "$config_file" ]] && source "$config_file"