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

pash-posix: clean up

This commit is contained in:
Dylan Araps 2019-11-26 12:13:24 +00:00
parent 8f809abee9
commit f480e29ee0
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pash-posix
View File

@ -92,7 +92,7 @@ yn() {
# Read a single byte from stdin using 'dd'. POSIX 'read' has # Read a single byte from stdin using 'dd'. POSIX 'read' has
# no support for single/'N' byte based input from the user. # no support for single/'N' byte based input from the user.
REPLY=$(dd ibs=1 count=1 2>/dev/null) answer=$(dd ibs=1 count=1 2>/dev/null)
# Disable raw input, leaving the terminal how we *should* # Disable raw input, leaving the terminal how we *should*
# have found it. # have found it.
@ -103,7 +103,7 @@ yn() {
# Handle the answer here directly, enabling this function's # Handle the answer here directly, enabling this function's
# return status to be used in place of checking for '[yY]' # return status to be used in place of checking for '[yY]'
# throughout this program. # throughout this program.
glob "$REPLY" '[yY]' || return 1 && return 0 glob "$answer" '[yY]' || return 1 && return 0
} }
glob() { glob() {
@ -149,7 +149,8 @@ main() {
hash gpg 2>/dev/null && gpg=gpg hash gpg 2>/dev/null && gpg=gpg
hash gpg2 2>/dev/null && gpg=gpg2 hash gpg2 2>/dev/null && gpg=gpg2
[ "$gpg" ] || die "GPG not found." [ "$gpg" ] ||
die "GPG not found."
mkdir -p "$PASH_DIR" || mkdir -p "$PASH_DIR" ||
die "Couldn't create password directory." die "Couldn't create password directory."
@ -172,10 +173,8 @@ main() {
glob "$2" '/*' && glob "$2" '/*' &&
die "Category can't start with '/'." die "Category can't start with '/'."
glob "$2" '*/*' && { glob "$2" '*/*' && { mkdir -p "${2%/*}" ||
mkdir -p "${2%/*}" || die "Couldn't create category '${2%/*}'."; }
die "Couldn't create category '${2%/*}'."
}
umask 077 umask 077