projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modify/cleanup add_certifier and add_revoker, so that their code base
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index 31f8ddd08a0cbba9f633be7576a24c836a9e58c5..745a86111292bd1ec08bb6a9479c424ca53c0b0e 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-8,7
+8,7
@@
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# Copyright 2008, released under the GPL, version 3 or later
+# Copyright 2008
-2009
, released under the GPL, version 3 or later
# all-caps variables are meant to be user supplied (ie. from config
# file) and are considered global
# all-caps variables are meant to be user supplied (ie. from config
# file) and are considered global
@@
-21,7
+21,7
@@
SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
export SYSCONFIGDIR
# monkeysphere version
export SYSCONFIGDIR
# monkeysphere version
-VERSION=
__VERSION__
+VERSION=
0.23~pre
# default log level
LOG_LEVEL="INFO"
# default log level
LOG_LEVEL="INFO"
@@
-149,9
+149,14
@@
cutline() {
head --line="$1" "$2" | tail -1
}
head --line="$1" "$2" | tail -1
}
-# make a temporary direct
l
y
+# make a temporary direct
or
y
msmktempdir() {
msmktempdir() {
- mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
+ mktemp -d ${TMPDIR:-/tmp}/monkeysphere.XXXXXXXXXX
+}
+
+# make a temporary file
+msmktempfile() {
+ mktemp ${TMPDIR:-/tmp}/monkeysphere.XXXXXXXXXX
}
# this is a wrapper for doing lock functions.
}
# this is a wrapper for doing lock functions.
@@
-1148,7
+1153,6
@@
process_authorized_user_ids() {
# takes a gpg key or keys on stdin, and outputs a list of
# fingerprints, one per line:
list_primary_fingerprints() {
# takes a gpg key or keys on stdin, and outputs a list of
# fingerprints, one per line:
list_primary_fingerprints() {
- local file="$1"
local fake=$(msmktempdir)
GNUPGHOME="$fake" gpg --no-tty --quiet --import
GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys | \
local fake=$(msmktempdir)
GNUPGHOME="$fake" gpg --no-tty --quiet --import
GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys | \