projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use msmktempfile instead of raw mktemp -- should be more portable
[monkeysphere.git]
/
src
/
monkeysphere
diff --git
a/src/monkeysphere
b/src/monkeysphere
index e268058f267fc7f1c030fe25127fdda2ea706ac1..8e6e81a5aeb85f887be2a304885979da3d1923cf 100755
(executable)
--- a/
src/monkeysphere
+++ b/
src/monkeysphere
@@
-3,7
+3,7
@@
# monkeysphere: Monkeysphere client tool
#
# The monkeysphere scripts are written by:
# monkeysphere: Monkeysphere client tool
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fi
fthhorseman
.net>
+# Jameson Rollins <jrollins@fi
nestructure
.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# Micah Anderson <micah@riseup.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# Micah Anderson <micah@riseup.net>
@@
-68,7
+68,7
@@
gpg_user() {
# output the ssh fingerprint of a gpg key
gpg_ssh_fingerprint() {
keyid="$1"
# output the ssh fingerprint of a gpg key
gpg_ssh_fingerprint() {
keyid="$1"
- local tmpfile=$(m
ktemp
)
+ local tmpfile=$(m
smktempfile
)
# trap to remove tmp file if break
trap "rm -f $tmpfile" EXIT
# trap to remove tmp file if break
trap "rm -f $tmpfile" EXIT
@@
-276,11
+276,13
@@
case $COMMAND in
;;
'keys-for-userid'|'u')
;;
'keys-for-userid'|'u')
+ CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
keys_for_userid "$@"
;;
'keys-from-userid')
echo "Warning: 'keys-from-userid' is deprecated. Please use 'keys-for-userid' instead." >&2
keys_for_userid "$@"
;;
'keys-from-userid')
echo "Warning: 'keys-from-userid' is deprecated. Please use 'keys-for-userid' instead." >&2
+ CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
keys_for_userid "$@"
;;
keys_for_userid "$@"
;;