summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-22 21:16:53 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-22 21:16:53 -0400
commitae45223b3187476c4828254676edd94aff443ade (patch)
treeeb4ab61f902b62e5d97dbe08e84a7b140a87064e
parent43302310c0fd9132027593ee06c6ba62436e2064 (diff)
more monotone changes from Thomas Keller
-rwxr-xr-xikiwiki-makerepo20
1 files changed, 11 insertions, 9 deletions
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 245043a5c..ef6274498 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -92,16 +92,18 @@ monotone)
echo "$srcdir already seems to be a monotone working copy" >&2
exit 1
fi
- repodir=$(dirname "$repository")
- mkdir -p "$repodir"
- file_basename=$(basename "$repository" | sed -e 's/\.monotone$//' |\
- tr -s "[:space:]" "_" | sed 's/_$//g')
+
+ mkdir -p "$(dirname "$repository")"
+ # fix the repository suffix we get from auto.setup
+ repository="$(echo "$repository" | sed 's/.monotone/.mtn/g')"
+ 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 | tr "\n" ".")
- branch_name="$reverse_hostname$file_basename"
- reponame_with_ext="$file_basename.monotone"
- mtn db init -d "$repodir/$reponame_with_ext"
- mtn setup -d "$repodir/$reponame_with_ext" -b "$branch_name" "$srcdir"
+ 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 .