Merge commit 'origin'

[git.ikiwiki.info.git] / ikiwiki-makerepo

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index aef3e4d0f7cd68dab8242958061ac27329f2db82..c3d835c308436a5a50d158420ba827c80b95e8af 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -92,16 +92,16 @@ monotone)
                echo "$srcdir already seems to be a monotone working copy" >&2
                exit 1
        fi
-       repodir=$(dirname "$repository")
-       mkdir -p "$repodir"
-       file_basename=$(basename -s .monotone "$repository" |\
-               tr -s "[:space:]" "_" | sed 's/_$//g')
-       reverse_hostname=$((hostname -f 2>/dev/null || hostname) |\
-               tr  "." "\n" | tail -r | tr "\n" ".")
-       branch_name="$reverse_hostname$file_basename"
-       reponame_with_ext="$file_basename.mtn"
-       mtn db init -d "$repodir/$reponame_with_ext"
-       mtn setup -d "$repodir/$reponame_with_ext" -b "$branch_name" "$srcdir"
+
+       mkdir -p "$(dirname "$repository")"
+       mtn db init -d "$repository"
+
+       cleaned_srcdir=$(basename "$srcdir" | tr -s "[:space:]" "_" | sed 's/_$//g')
+       reverse_hostname=$( (hostname -f 2>/dev/null || hostname) |\
+               tr  "." "\n" | ( tac 2>/dev/null || tail -r ) | tr "\n" "." )
+       branch_name="$reverse_hostname$cleaned_srcdir"
+       mtn setup -d "$repository" -b "$branch_name" "$srcdir"
+
        cd "$srcdir"
        echo \.ikiwiki$ > .mtn-ignore
        mtn add -R .
@@ -109,6 +109,17 @@ monotone)
        # with a default key floating around...
        mtn ci -m "initial import"
        echo "Directory $srcdir is now set up as a monotone repository"
+       echo ""
+       echo "Note: If your monotone key has a passphrase, you need to configure"
+       echo "monotone to automatically use it. Otherwise, web commits to ikiwiki"
+       echo "will fail."
+       echo ""
+       echo "You can create a $srcdir/_MTN/monotonerc"
+       echo "containing the passphrase:"
+       echo ""
+       echo "function get_passphrase (branchname)"
+       echo '    return "passphrasehere"'
+       echo "end"
 ;;
 *)
        echo "Unsupported revision control system $rcs" >&2