projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dkg/master'
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index d151e859c5b3367316167e64e2acba7e4fcc21cb..b2dcd35d98628ed56ba6472b78f7b7444ab8e396 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-20,9
+20,6
@@
SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
export SYSCONFIGDIR
SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
export SYSCONFIGDIR
-# monkeysphere version
-VERSION=0.23~pre
-
# default log level
LOG_LEVEL="INFO"
# default log level
LOG_LEVEL="INFO"
@@
-41,6
+38,11
@@
PROMPT="true"
########################################################################
### UTILITY FUNCTIONS
########################################################################
### UTILITY FUNCTIONS
+# output version info
+version() {
+ cat "${SYSSHAREDIR}/VERSION"
+}
+
# failure function. exits with code 255, unless specified otherwise.
failure() {
[ "$1" ] && echo "$1" >&2
# failure function. exits with code 255, unless specified otherwise.
failure() {
[ "$1" ] && echo "$1" >&2
@@
-586,8
+588,8
@@
gpg2authorized_keys() {
# FIXME: need to figure out how to retrieve all matching keys
# (not just first N (5 in this case))
gpg_fetch_userid() {
# FIXME: need to figure out how to retrieve all matching keys
# (not just first N (5 in this case))
gpg_fetch_userid() {
+ local returnCode=0
local userID
local userID
- local returnCode
if [ "$CHECK_KEYSERVER" != 'true' ] ; then
return 0
if [ "$CHECK_KEYSERVER" != 'true' ] ; then
return 0
@@
-626,6
+628,7
@@
gpg_fetch_userid() {
#
# expects global variable: "MODE"
process_user_id() {
#
# expects global variable: "MODE"
process_user_id() {
+ local returnCode=0
local userID
local requiredCapability
local requiredPubCapability
local userID
local requiredCapability
local requiredPubCapability
@@
-657,10
+660,10
@@
process_user_id() {
# output gpg info for (exact) userid and store
gpgOut=$(gpg --list-key --fixed-list-mode --with-colon \
--with-fingerprint --with-fingerprint \
# output gpg info for (exact) userid and store
gpgOut=$(gpg --list-key --fixed-list-mode --with-colon \
--with-fingerprint --with-fingerprint \
- ="$userID" 2>/dev/null)
+ ="$userID" 2>/dev/null)
|| returnCode="$?"
# if the gpg query return code is not 0, return 1
# if the gpg query return code is not 0, return 1
- if [ "$
?
" -ne 0 ] ; then
+ if [ "$
returnCode
" -ne 0 ] ; then
log verbose " no primary keys found."
return 1
fi
log verbose " no primary keys found."
return 1
fi
@@
-890,6
+893,7
@@
process_host_known_hosts() {
# update the known_hosts file for a set of hosts listed on command
# line
update_known_hosts() {
# update the known_hosts file for a set of hosts listed on command
# line
update_known_hosts() {
+ local returnCode=0
local nHosts
local nHostsOK
local nHostsBAD
local nHosts
local nHostsOK
local nHostsBAD
@@
-919,9
+923,9
@@
update_known_hosts() {
for host ; do
# process the host
for host ; do
# process the host
- process_host_known_hosts "$host"
+ process_host_known_hosts "$host"
|| returnCode="$?"
# note the result
# note the result
- case "$
?
" in
+ case "$
returnCode
" in
0)
nHostsOK=$((nHostsOK+1))
;;
0)
nHostsOK=$((nHostsOK+1))
;;
@@
-1043,6
+1047,7
@@
process_uid_authorized_keys() {
# update the authorized_keys files from a list of user IDs on command
# line
update_authorized_keys() {
# update the authorized_keys files from a list of user IDs on command
# line
update_authorized_keys() {
+ local returnCode=0
local userID
local nIDs
local nIDsOK
local userID
local nIDs
local nIDsOK
@@
-1072,10
+1077,10
@@
update_authorized_keys() {
for userID ; do
# process the user ID, change return code if key not found for
# user ID
for userID ; do
# process the user ID, change return code if key not found for
# user ID
- process_uid_authorized_keys "$userID"
+ process_uid_authorized_keys "$userID"
|| returnCode="$?"
# note the result
# note the result
- case "$
?
" in
+ case "$
returnCode
" in
0)
nIDsOK=$((nIDsOK+1))
;;
0)
nIDsOK=$((nIDsOK+1))
;;
@@
-1153,7
+1158,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 | \