projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
actually check for md5 in the path within file_hash()
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index 5a118172d72774b7ae341269b9ef6bd17f864774..ac0b5d6382a9dd2c345209d0b18d605b1ee84d27 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-147,8
+147,8
@@
lock() {
local action="$1"
local file="$2"
local action="$1"
local file="$2"
- if ! (
which lockfile-create >/dev/null 2
>/dev/null ) ; then
- if ! (
which lockfile
>/dev/null ); then
+ if ! (
type lockfile-create &
>/dev/null ) ; then
+ if ! (
type lockfile &
>/dev/null ); then
failure "Neither lockfile-create nor lockfile are in the path!"
fi
use_lockfileprogs=
failure "Neither lockfile-create nor lockfile are in the path!"
fi
use_lockfileprogs=
@@
-197,7
+197,7
@@
advance_date() {
local shortunits
# try things the GNU way first
local shortunits
# try things the GNU way first
- if date -d "$number $longunits" "$format"
>/dev/null 2>&1
; then
+ if date -d "$number $longunits" "$format"
&>/dev/null
; then
date -d "$number $longunits" "$format"
else
# otherwise, convert to (a limited version of) BSD date syntax:
date -d "$number $longunits" "$format"
else
# otherwise, convert to (a limited version of) BSD date syntax:
@@
-252,7
+252,13
@@
check_capability() {
# hash of a file
file_hash() {
# hash of a file
file_hash() {
- md5sum "$1" 2> /dev/null
+ if type md5sum &>/dev/null ; then
+ md5sum "$1"
+ elif type md5 &>/dev/null ; then
+ md5 "$1"
+ else
+ failure "Neither md5sum nor md5 are in the path!"
+ fi
}
# convert escaped characters in pipeline from gpg output back into
}
# convert escaped characters in pipeline from gpg output back into
@@
-303,7
+309,9
@@
passphrase_prompt() {
local fifo="$2"
local PASS
local fifo="$2"
local PASS
- if [ "$DISPLAY" ] && which "${SSH_ASKPASS:-ssh-askpass}" >/dev/null; then
+ if [ "$DISPLAY" ] && type "${SSH_ASKPASS:-ssh-askpass}" >/dev/null; then
+ printf 'Launching "%s"\n' "${SSH_ASKPASS:-ssh-askpass}" | log info
+ printf '(with prompt "%s")\n' "$prompt" | log debug
"${SSH_ASKPASS:-ssh-askpass}" "$prompt" > "$fifo"
else
read -s -p "$prompt" PASS
"${SSH_ASKPASS:-ssh-askpass}" "$prompt" > "$fifo"
else
read -s -p "$prompt" PASS
@@
-331,7
+339,7
@@
remove_line() {
fi
# if the string is in the file...
fi
# if the string is in the file...
- if grep -q -F "$string" "$file" 2>
/dev/null ; then
+ if grep -q -F "$string" "$file" 2>/dev/null ; then
tempfile=$(mktemp "${file}.XXXXXXX") || \
failure "Unable to make temp file '${file}.XXXXXXX'"
tempfile=$(mktemp "${file}.XXXXXXX") || \
failure "Unable to make temp file '${file}.XXXXXXX'"
@@
-437,7
+445,7
@@
check_key_file_permissions() {
# return 2 if path has group or other writability
if is_write "$gAccess" || is_write "$oAccess" ; then
log error "improper group or other writability on path '$path':"
# return 2 if path has group or other writability
if is_write "$gAccess" || is_write "$oAccess" ; then
log error "improper group or other writability on path '$path':"
- log error " group: $gAccess, other: $oAcess"
+ log error " group: $gAccess, other: $oAc
c
ess"
return 2
fi
return 2
fi
@@
-458,7
+466,7
@@
gpg2ssh() {
keyID="$1"
keyID="$1"
- gpg --export "$keyID" | openpgp2ssh "$keyID" 2>
/dev/null
+ gpg --export "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
}
# output known_hosts line from ssh key
}
# output known_hosts line from ssh key
@@
-467,7
+475,11
@@
ssh2known_hosts() {
local port
local key
local port
local key
- host=${1%%:*}
+ # FIXME this does not properly deal with IPv6 hosts using the
+ # standard port (because it's unclear whether their final
+ # colon-delimited address section is a port number or an address
+ # string)
+ host=${1%:*}
port=${1##*:}
key="$2"
port=${1##*:}
key="$2"
@@
-545,7
+557,7
@@
gpg_fetch_userid() {
echo 1,2,3,4,5 | \
gpg --quiet --batch --with-colons \
--command-fd 0 --keyserver "$KEYSERVER" \
echo 1,2,3,4,5 | \
gpg --quiet --batch --with-colons \
--command-fd 0 --keyserver "$KEYSERVER" \
- --search ="$userID"
> /dev/null 2>&1
+ --search ="$userID"
&>/dev/null
returnCode="$?"
return "$returnCode"
returnCode="$?"
return "$returnCode"
@@
-805,7
+817,7
@@
process_host_known_hosts() {
# hash from stdin to stdout
tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
ssh2known_hosts "$host" "$sshKey" > "$tmpfile"
# hash from stdin to stdout
tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
ssh2known_hosts "$host" "$sshKey" > "$tmpfile"
- ssh-keygen -H -f "$tmpfile" 2>
/dev/null
+ ssh-keygen -H -f "$tmpfile" 2>/dev/null
cat "$tmpfile" >> "$KNOWN_HOSTS"
rm -f "$tmpfile" "${tmpfile}.old"
else
cat "$tmpfile" >> "$KNOWN_HOSTS"
rm -f "$tmpfile" "${tmpfile}.old"
else
@@
-1087,7
+1099,7
@@
process_authorized_user_ids() {
# check permissions on the authorized_user_ids file path
check_key_file_permissions $(whoami) "$authorizedUserIDs" || failure
# check permissions on the authorized_user_ids file path
check_key_file_permissions $(whoami) "$authorizedUserIDs" || failure
- if ! meat "$authorizedUserIDs" >
/dev/null ; then
+ if ! meat "$authorizedUserIDs" >/dev/null ; then
log debug " no user IDs to process."
return
fi
log debug " no user IDs to process."
return
fi