octoleo
/
Purse
mirror of https://github.com/octoleo/Purse.git
1
0
Fork 0
Code Releases Activity

Support username command line argument. Style clean up.

This commit is contained in:
drduh 2015-07-31 00:08:43 -04:00
parent 3e94bc0ce8
commit 225b572910
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pwd.sh
View File

@ -6,6 +6,7 @@ set -o errtrace
set -o nounset set -o nounset
set -o pipefail set -o pipefail
args=("$@")
gpg=$(command -v gpg || command -v gpg2) gpg=$(command -v gpg || command -v gpg2)
safe=${PWDSH_SAFE:=pwd.sh.safe} safe=${PWDSH_SAFE:=pwd.sh.safe}
@ -68,6 +69,13 @@ encrypt () {
read_pass () { read_pass () {
# Read a password from safe. # Read a password from safe.
if [[ -z "${2+x}" ]] ; then
read -p "
Username to read? (default: all) " username
else
username="${2}"
fi
if [[ -z ${username} || ${username} == "all" ]] ; then if [[ -z ${username} || ${username} == "all" ]] ; then
username="" username=""
fi fi
@ -104,7 +112,7 @@ write_pass () {
# Write a password in safe. # Write a password in safe.
# If no password provided, clear the entry by writing an empty line. # If no password provided, clear the entry by writing an empty line.
if [ -z ${userpass+x} ] ; then if [[ -z ${userpass+x} ]] ; then
new_entry=" " new_entry=" "
else else
new_entry="${userpass} ${username}" new_entry="${userpass} ${username}"
@ -118,7 +126,7 @@ write_pass () {
# Filter out any blank lines. # Filter out any blank lines.
# Finally, encrypt it all to a new safe file, or fail. # Finally, encrypt it all to a new safe file, or fail.
# If successful, update to new safe file. # If successful, update to new safe file.
( if [ -f ${safe} ] ; then ( if [[ -f ${safe} ]] ; then
decrypt ${password} ${safe} | \ decrypt ${password} ${safe} | \
grep -v -e " ${username}$" || return grep -v -e " ${username}$" || return
fi ; \ fi ; \
@ -132,10 +140,15 @@ write_pass () {
create_username () { create_username () {
# Create a new username and password. # Create a new username and password.
read -p " if [[ -z "${2+x}" ]] ; then
read -p "
Username: " username Username: " username
read -p " read -p "
Generate password? (y/n, default: y) " rand_pass Generate password? (y/n, default: y) " rand_pass
else
rand_pass=""
username="${2}"
fi
if [[ "${rand_pass}" =~ ^([nN][oO]|[nN])$ ]]; then if [[ "${rand_pass}" =~ ^([nN][oO]|[nN])$ ]]; then
get_pass " get_pass "
@ -160,22 +173,29 @@ sanity_check () {
sanity_check sanity_check
if [ -z ${1+x} ] if [[ -z "${1+x}" ]] ; then
then read -n 1 -p "
read -n 1 -p "Read, write, or delete password? (r/w/d, default: r) " action Read, write, or delete password? (r/w/d, default: r) " action
printf "\n" printf "\n"
else else
action="$1" action="${1}"
fi fi
if [[ "${action}" =~ ^([wW])$ ]] ; then if [[ "${action}" =~ ^([wW])$ ]] ; then
create_username && write_pass create_username "$@"
write_pass
elif [[ "${action}" =~ ^([dD])$ ]] ; then elif [[ "${action}" =~ ^([dD])$ ]] ; then
read -p " if [[ -z "${2+x}" ]] ; then
Username to delete? " username && write_pass read -p "
Username to delete? " username
else
username="${2}"
fi
write_pass
else else
read -p " read_pass "$@"
Username to read? (default: all) " username && read_pass
fi fi
tput setaf 2 ; echo " tput setaf 2 ; echo "