aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Steinke <rasi@xssn.at>2016-02-23 02:47:18 +0100
committerRasmus Steinke <rasi@xssn.at>2016-02-23 02:47:18 +0100
commit3592938ba724c94c030a2c23085d3ba5b76087b0 (patch)
tree32e1f983b350222802d41e0d1df825b1eb55c1df
parent40e2fd8772a5c4f9fa97dfae82420af879c1f893 (diff)
parent7911e140b36139bed75d1f0dd578f56cf5106cfc (diff)
downloadrofi-pass-3592938ba724c94c030a2c23085d3ba5b76087b0.tar.gz
Merge pull request #29 from Narrat/optim/whitespaces
Whitespace issues
-rw-r--r--Makefile10
-rw-r--r--README.md2
-rwxr-xr-xaddpass1
-rwxr-xr-xrofi-pass42
4 files changed, 27 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index 96fa97e..81f83ee 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ ifndef PREFIX
endif
install:
- install -Dm755 rofi-pass $(DESTDIR)$(PREFIX)/bin/rofi-pass
- install -Dm755 addpass $(DESTDIR)$(PREFIX)/bin/addpass
- 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 config.example $(DESTDIR)/etc/rofi-pass.conf
+ install -Dm755 rofi-pass $(DESTDIR)$(PREFIX)/bin/rofi-pass
+ install -Dm755 addpass $(DESTDIR)$(PREFIX)/bin/addpass
+ 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 config.example $(DESTDIR)/etc/rofi-pass.conf
diff --git a/README.md b/README.md
index 14c6812..82097a8 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ For an example configuration please take a look at the included `config.example`
## Extras
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"
diff --git a/addpass b/addpass
index 973c862..5e61dc3 100755
--- a/addpass
+++ b/addpass
@@ -65,4 +65,3 @@ elif [[ "$group" == "" ]]; then
else
printEntry | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${Name}"
fi
-
diff --git a/rofi-pass b/rofi-pass
index 010e8e0..10a3f6e 100755
--- a/rofi-pass
+++ b/rofi-pass
@@ -10,11 +10,11 @@ list_passwords() {
cd "${root}"
passwords=( **/*.gpg )
- for password in "${passwords[@]}"; do
- filename="${password}"
- filename="${filename%.gpg}"
- echo "$filename"
- done
+ for password in "${passwords[@]}"; do
+ filename="${password}"
+ filename="${filename%.gpg}"
+ echo "$filename"
+ done
}
doClip () {
@@ -38,7 +38,7 @@ autopass () {
if [[ ${selected_password} == "[ Add Entry ]>" ]]; then insertPass;
elif [[ ${selected_password} == "---" ]]; then mainMenu;
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"
if [[ -z "${stuff["$AUTOTYPE_field"]}" ]]; then
echo -n "${stuff["${USERNAME_field}"]}" | xdotool type --clearmodifiers --file -
@@ -155,7 +155,7 @@ mainMenu () {
-p "rofi-pass > ")"
rofi_exit=$?
-
+
if [[ $rofi_exit -eq 1 ]]; then
exit
elif [[ $rofi_exit -eq 10 ]]; then
@@ -189,7 +189,7 @@ ${line3}</span>"
-select "$entry" \
-p "rofi-pass > ")"
- rofi_exit=$?
+ rofi_exit=$?
if [[ ${selected_password} == "[ Add Entry ]>" ]]; then
:
@@ -223,13 +223,13 @@ ${line3}</span>"
elif [[ "${rofi_exit}" -eq 24 ]]; then copyMenu;
elif [[ "${rofi_exit}" -eq 26 ]]; then $(${basecommand} --bmarks);
fi
- password=''
- selected_password=''
- unset stuff
- unset password
- unset selected_password
- unset password_temp
- unset stuff
+ password=''
+ selected_password=''
+ unset stuff
+ unset password
+ unset selected_password
+ unset password_temp
+ unset stuff
fi
}
@@ -342,11 +342,11 @@ showEntry () {
elif [[ ${rofi_exit} -eq 1 ]]; then
exit
fi
- unset stuff
- unset password
- unset selected_password
- unset password_temp
- unset stuff
+ unset stuff
+ unset password
+ unset selected_password
+ unset password_temp
+ unset stuff
exit
}
@@ -498,7 +498,7 @@ if [[ ! -d /tmp/$USER-rofi-pass ]]; then
mkdir /tmp/$USER-rofi-pass
fi
-# set help color
+# set help color
if [[ $help_color == "" ]]; then
help_color=$(rofi -dump-xresources | grep 'rofi.color.normal' | awk -F ',' '/,/{gsub(/ /, "", $2); print $2}')
fi