projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more replacement of read -p with printf; read (re #446)
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index f954bb94a071d6d78891878d526be950bbe488b1..c88857e44adabca90d57bb02358bcce92d16f67d 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-291,7
+291,8
@@
Please specify how long the key should be valid.
<n>y = key expires in n years
EOF
while [ -z "$keyExpire" ] ; do
<n>y = key expires in n years
EOF
while [ -z "$keyExpire" ] ; do
- read -p "Key is valid for? (0) " keyExpire
+ printf "Key is valid for? (0) " >&2
+ read keyExpire
if ! test_gpg_expire ${keyExpire:=0} ; then
echo "invalid value" >&2
unset keyExpire
if ! test_gpg_expire ${keyExpire:=0} ; then
echo "invalid value" >&2
unset keyExpire
@@
-425,6
+426,12
@@
check_key_file_permissions() {
log debug "checking path permission '$path'..."
log debug "checking path permission '$path'..."
+ # rewrite path if it points to a symlink
+ if [ -h "$path" ] ; then
+ path=$(readlink -f "$path")
+ log debug "checking path symlink '$path'..."
+ fi
+
# return 255 if cannot stat file
if ! stat=$(ls -ld "$path" 2>/dev/null) ; then
log error "could not stat path '$path'."
# return 255 if cannot stat file
if ! stat=$(ls -ld "$path" 2>/dev/null) ; then
log error "could not stat path '$path'."
@@
-466,6
+473,8
@@
list_users() {
elif type dscl &>/dev/null ; then
# for Darwin systems
dscl localhost -list /Search/Users
elif type dscl &>/dev/null ; then
# for Darwin systems
dscl localhost -list /Search/Users
+ else
+ failure "Neither getent or dscl is in the path! Could not determine list of users."
fi
}
fi
}