making invocations of mktemp portable (FreeBSD does not have a default value for...

[monkeysphere.git] / src / common

diff --git a/src/common b/src/common
index 25f7e4efc245fa7b95cb39ca946a1e50ab8fef23..c8a7db65425523a59d84ec7aab094e384db96100 100644 (file)
--- a/src/common
+++ b/src/common
@@ -98,7 +98,7 @@ cutline() {
 lock() {
     local use_lockfileprogs=true
     local action="$1"
-    local file="$file"
+    local file="$2"
 
     if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then
        if ! ( which lockfile >/dev/null ); then
@@ -726,7 +726,7 @@ process_host_known_hosts() {
            if [ "$HASH_KNOWN_HOSTS" = 'true' ] ; then
                # FIXME: this is really hackish cause ssh-keygen won't
                # hash from stdin to stdout
-               tmpfile=$(mktemp)
+               tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
                ssh2known_hosts "$host" "$sshKey" > "$tmpfile"
                ssh-keygen -H -f "$tmpfile" 2> /dev/null
                cat "$tmpfile" >> "$KNOWN_HOSTS"