projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added explicit bash dependency on version >= 3.2 for modern conditional regex matching
[monkeysphere.git]
/
src
/
monkeysphere
diff --git
a/src/monkeysphere
b/src/monkeysphere
index 1dee3bab81411bf6c03441a0dfa6fc3cf1c089ae..e268058f267fc7f1c030fe25127fdda2ea706ac1 100755
(executable)
--- a/
src/monkeysphere
+++ b/
src/monkeysphere
@@
-74,7
+74,7
@@
gpg_ssh_fingerprint() {
trap "rm -f $tmpfile" EXIT
# use temporary file, since ssh-keygen won't accept keys on stdin
trap "rm -f $tmpfile" EXIT
# use temporary file, since ssh-keygen won't accept keys on stdin
- gpg_user --export "$keyid" | openpgp2ssh "$keyid" >"$tmpfile"
+ gpg_user --export "$keyid"
--no-armor
| openpgp2ssh "$keyid" >"$tmpfile"
ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
# remove the tmp file
ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
# remove the tmp file
@@
-251,7
+251,7
@@
case $COMMAND in
process_authorized_user_ids "$AUTHORIZED_USER_IDS"
;;
process_authorized_user_ids "$AUTHORIZED_USER_IDS"
;;
- 'import-subkey'|'i')
+ 'import-subkey'|'i
mport'|'i
')
source "${MSHAREDIR}/import_subkey"
import_subkey "$@"
;;
source "${MSHAREDIR}/import_subkey"
import_subkey "$@"
;;