Whitespace issues

This commit addresses some mangling of spaces and tabs and trailing whitespaces
This commit is contained in:
Narrat 2016-02-23 00:12:51 +01:00
parent de700a7255
commit 7911e140b3
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

@ -51,7 +51,7 @@ For an example configuration please take a look at the included `config.example`
## Extras ## Extras
rofi-pass comes with a tiny helper script, which makes it easier to create new pass entries. rofi-pass comes with a tiny helper script, which makes it easier to create new pass entries.
Just run it with Just run it with
``` ```
addpass --name "My new Site" +user "zeltak" +branch "branch" +custom "foobar" +autotype "branch :tab user :tab pass" addpass --name "My new Site" +user "zeltak" +branch "branch" +custom "foobar" +autotype "branch :tab user :tab pass"

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 () {
@ -38,7 +38,7 @@ autopass () {
if [[ ${selected_password} == "[ Add Entry ]>" ]]; then insertPass; if [[ ${selected_password} == "[ Add Entry ]>" ]]; then insertPass;
elif [[ ${selected_password} == "---" ]]; then mainMenu; elif [[ ${selected_password} == "---" ]]; then mainMenu;
else else
rm -f "/tmp/$USER-rofi-pass/last_used" rm -f "/tmp/$USER-rofi-pass/last_used"
echo "${root}: $selected_password" > "/tmp/$USER-rofi-pass/last_used" echo "${root}: $selected_password" > "/tmp/$USER-rofi-pass/last_used"
if [[ -z "${stuff["$AUTOTYPE_field"]}" ]]; then if [[ -z "${stuff["$AUTOTYPE_field"]}" ]]; then
echo -n "${stuff["${USERNAME_field}"]}" | xdotool type --clearmodifiers --file - echo -n "${stuff["${USERNAME_field}"]}" | xdotool type --clearmodifiers --file -
@ -155,7 +155,7 @@ mainMenu () {
-p "rofi-pass > ")" -p "rofi-pass > ")"
rofi_exit=$? rofi_exit=$?
if [[ $rofi_exit -eq 1 ]]; then if [[ $rofi_exit -eq 1 ]]; then
exit exit
elif [[ $rofi_exit -eq 10 ]]; then elif [[ $rofi_exit -eq 10 ]]; then
@ -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
} }
@ -498,7 +498,7 @@ if [[ ! -d /tmp/$USER-rofi-pass ]]; then
mkdir /tmp/$USER-rofi-pass mkdir /tmp/$USER-rofi-pass
fi fi
# set help color # set help color
if [[ $help_color == "" ]]; then if [[ $help_color == "" ]]; then
help_color=$(rofi -dump-xresources | grep 'rofi.color.normal' | awk -F ', ' '{ print $2 }') help_color=$(rofi -dump-xresources | grep 'rofi.color.normal' | awk -F ', ' '{ print $2 }')
help_separator_color=$(rofi -dump-xresources | grep 'rofi.color.normal' | awk -F ', ' '{ print $2 }') help_separator_color=$(rofi -dump-xresources | grep 'rofi.color.normal' | awk -F ', ' '{ print $2 }')