stupidcomputer
/
pash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pash-posix: Fix clean up

This commit is contained in:
Dylan Araps 2019-11-25 22:52:11 +00:00
parent ef2c24e742
commit 8754909d32
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pash-posix
View File

@ -3,7 +3,7 @@
# pash - simple password manager. # pash - simple password manager.
pw_add() { pw_add() {
pass_name=$1 name=$1
if yn "Generate a password?"; then if yn "Generate a password?"; then
# Use 'gpg' to generate the password. This could have # Use 'gpg' to generate the password. This could have
@ -18,7 +18,7 @@ pw_add() {
# The 'cut' is required to actually truncate the password # The 'cut' is required to actually truncate the password
# to the set length as the 'base64' encoding makes the # to the set length as the 'base64' encoding makes the
# resulting string longer than the given length. # resulting string longer than the given length.
pass=$("$gpg" --gen-random -a "${PASH_LENGTH:-50}" |\ pass=$("$gpg" -a --gen-random 1 "${PASH_LENGTH:-50}" |\
cut -c -"${PASH_LENGTH:-50}") cut -c -"${PASH_LENGTH:-50}")
else else
@ -31,8 +31,7 @@ pw_add() {
printf '\n' printf '\n'
fi fi
[ "$pass" ] || [ "$pass" ] || die "Failed to generate a password."
die "Failed to generate a password."
# Mimic the use of an array for storing arguments by... using # Mimic the use of an array for storing arguments by... using
# the function's argument list. This is very apt isn't it? # the function's argument list. This is very apt isn't it?
@ -45,7 +44,8 @@ pw_add() {
# Use 'gpg' to store the password in an encrypted file. The # Use 'gpg' to store the password in an encrypted file. The
# 'GPG_TTY' environment variable is set to workaround cases # 'GPG_TTY' environment variable is set to workaround cases
# where 'gpg' cannot find an attached terminal. # where 'gpg' cannot find an attached terminal.
echo "$pass" | GPG_TTY=$(tty) "$gpg" "$@" -o "$pass_name.gpg" echo "$pass" | GPG_TTY=$(tty) "$gpg" "$@" -o "$name.gpg" &&
printf '%s\n' "Saved '$name' to the store."
} }
pw_del() { pw_del() {
@ -69,8 +69,9 @@ pw_copy() {
if [ "$TMUX" ]; then if [ "$TMUX" ]; then
tmux load-buffer "$pass" tmux load-buffer "$pass"
else
hash xclip && echo "$pass" | xclip -selection clipboard elif hash xclip; then
echo "$pass" | xclip -selection clipboard
fi fi
} }
@ -135,6 +136,8 @@ exit 1
} }
main() { main() {
: "${PASH_DIR:=${XDG_DATA_HOME:=$HOME/.local/share}/pash}"
[ "$1" = '-?' ] || [ -z "$1" ] && [ "$1" = '-?' ] || [ -z "$1" ] &&
usage usage
@ -145,7 +148,7 @@ main() {
[ "$gpg" ] || die "GPG not found." [ "$gpg" ] || die "GPG not found."
mkdir -p "${PASH_DIR:=${XDG_DATA_HOME:=$HOME/.local/share}/pash}" || mkdir -p "$PASH_DIR" ||
die "Couldn't create password directory." die "Couldn't create password directory."
cd "$PASH_DIR" || cd "$PASH_DIR" ||
@ -166,13 +169,15 @@ main() {
glob "$2" '/*' && glob "$2" '/*' &&
die "Category can't start with '/'." die "Category can't start with '/'."
glob "$2" '*/*' && glob "$2" '*/*' && {
{ mkdir -p "${2%/*}" || die "Couldn't create category '${2%/*}'."; } mkdir -p "${2%/*}" ||
die "Couldn't create category '${2%/*}'."
}
umask 077 umask 077
case $1 in case $1 in
a*) pw_add "$2" && printf '%s\n' "Saved '$2' to the store." ;; a*) pw_add "$2" ;;
c*) pw_copy "$2" ;; c*) pw_copy "$2" ;;
d*) pw_del "$2" ;; d*) pw_del "$2" ;;
s*) pw_show "$2" ;; s*) pw_show "$2" ;;