Merge pull request #29 from Narrat/optim/whitespaces

Whitespace issues
This commit is contained in:
Rasmus Steinke 2016-02-23 02:47:18 +01:00
commit 3592938ba7
4 changed files with 27 additions and 28 deletions

View File

@ -3,8 +3,8 @@ ifndef PREFIX
endif endif
install: install:
install -Dm755 rofi-pass $(DESTDIR)$(PREFIX)/bin/rofi-pass install -Dm755 rofi-pass $(DESTDIR)$(PREFIX)/bin/rofi-pass
install -Dm755 addpass $(DESTDIR)$(PREFIX)/bin/addpass install -Dm755 addpass $(DESTDIR)$(PREFIX)/bin/addpass
install -Dm644 config.example $(DESTDIR)$(PREFIX)/share/doc/rofi-pass/config.example install -Dm644 config.example $(DESTDIR)$(PREFIX)/share/doc/rofi-pass/config.example
install -Dm644 README.md $(DESTDIR)$(PREFIX)/share/doc/rofi-pass/README.md install -Dm644 README.md $(DESTDIR)$(PREFIX)/share/doc/rofi-pass/README.md
install -Dm644 config.example $(DESTDIR)/etc/rofi-pass.conf install -Dm644 config.example $(DESTDIR)/etc/rofi-pass.conf

View File

@ -65,4 +65,3 @@ elif [[ "$group" == "" ]]; then
else else
printEntry | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${Name}" printEntry | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${Name}"
fi fi

View File

@ -10,11 +10,11 @@ list_passwords() {
cd "${root}" cd "${root}"
passwords=( **/*.gpg ) passwords=( **/*.gpg )
for password in "${passwords[@]}"; do for password in "${passwords[@]}"; do
filename="${password}" filename="${password}"
filename="${filename%.gpg}" filename="${filename%.gpg}"
echo "$filename" echo "$filename"
done done
} }
doClip () { doClip () {
@ -189,7 +189,7 @@ ${line3}</span>"
-select "$entry" \ -select "$entry" \
-p "rofi-pass > ")" -p "rofi-pass > ")"
rofi_exit=$? rofi_exit=$?
if [[ ${selected_password} == "[ Add Entry ]>" ]]; then if [[ ${selected_password} == "[ Add Entry ]>" ]]; then
: :
@ -223,13 +223,13 @@ ${line3}</span>"
elif [[ "${rofi_exit}" -eq 24 ]]; then copyMenu; elif [[ "${rofi_exit}" -eq 24 ]]; then copyMenu;
elif [[ "${rofi_exit}" -eq 26 ]]; then $(${basecommand} --bmarks); elif [[ "${rofi_exit}" -eq 26 ]]; then $(${basecommand} --bmarks);
fi fi
password='' password=''
selected_password='' selected_password=''
unset stuff unset stuff
unset password unset password
unset selected_password unset selected_password
unset password_temp unset password_temp
unset stuff unset stuff
fi fi
} }
@ -342,11 +342,11 @@ showEntry () {
elif [[ ${rofi_exit} -eq 1 ]]; then elif [[ ${rofi_exit} -eq 1 ]]; then
exit exit
fi fi
unset stuff unset stuff
unset password unset password
unset selected_password unset selected_password
unset password_temp unset password_temp
unset stuff unset stuff
exit exit
} }