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

pash: Add full stop in die()

This commit is contained in:
Dylan Araps 2019-11-30 15:02:10 +00:00
parent fa4547f2de
commit f917d4643c
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pash
View File

@ -28,7 +28,7 @@ pw_add() {
printf '\n' printf '\n'
fi fi
[ "$pass" ] || die "Failed to generate a password." [ "$pass" ] || 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?
@ -130,7 +130,7 @@ glob() {
} }
die() { die() {
printf 'error: %s\n' "$1" >&2 printf 'error: %s.\n' "$1" >&2
exit 1 exit 1
} }
@ -166,31 +166,31 @@ main() {
command -v gpg2 >/dev/null 2>&1 && gpg=gpg2 command -v gpg2 >/dev/null 2>&1 && gpg=gpg2
[ "$gpg" ] || [ "$gpg" ] ||
die "GPG not found." die "GPG not found"
mkdir -p "$PASH_DIR" || mkdir -p "$PASH_DIR" ||
die "Couldn't create password directory." die "Couldn't create password directory"
cd "$PASH_DIR" || cd "$PASH_DIR" ||
die "Can't access password directory." die "Can't access password directory"
glob "$1" '[acds]*' && [ -z "$2" ] && glob "$1" '[acds]*' && [ -z "$2" ] &&
die "Missing [name] argument." die "Missing [name] argument"
glob "$1" '[cds]*' && [ ! -f "$2.gpg" ] && glob "$1" '[cds]*' && [ ! -f "$2.gpg" ] &&
die "Pass file '$2' doesn't exist." die "Pass file '$2' doesn't exist"
glob "$1" 'a*' && [ -f "$2.gpg" ] && glob "$1" 'a*' && [ -f "$2.gpg" ] &&
die "Pass file '$2' already exists." die "Pass file '$2' already exists"
glob "$2" '*/*' && glob "$2" '*../*' && glob "$2" '*/*' && glob "$2" '*../*' &&
die "Category went out of bounds." die "Category went out of bounds"
glob "$2" '/*' && glob "$2" '/*' &&
die "Category can't start with '/'." die "Category can't start with '/'"
glob "$2" '*/*' && { mkdir -p "${2%/*}" || glob "$2" '*/*' && { mkdir -p "${2%/*}" ||
die "Couldn't create category '${2%/*}'."; } die "Couldn't create category '${2%/*}'"; }
# Set 'GPG_TTY' to the current 'TTY' if it # Set 'GPG_TTY' to the current 'TTY' if it
# is unset. Fixes a somewhat rare `gpg` issue. # is unset. Fixes a somewhat rare `gpg` issue.