X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4643233c180044bce1b588751a378ec361b43c54..ccf422e9904110f564f75ae6dac7813d2fbebeea:/ikiwiki-makerepo?ds=sidebyside

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 245043a5c..32a9f8646 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -75,7 +75,7 @@ mercurial)
 	hg init "$srcdir"
 	cd "$srcdir"
 	echo .ikiwiki > .hgignore
-	hg add * .hgignore
+	hg add
 	hg commit -m "initial import"
 	echo "Directory $srcdir is now set up as a mercurial repository"
 ;;
@@ -83,7 +83,7 @@ bzr)
 	bzr init "$srcdir"
 	cd "$srcdir"
 	echo .ikiwiki > .bzrignore
-	bzr add * .bzrignore
+	bzr add
 	bzr commit -m "initial import"
 	echo "Directory $srcdir is now set up as a bzr repository"
 ;;
@@ -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 "$repository" | sed -e 's/\.monotone$//' |\
-		tr -s "[:space:]" "_" | sed 's/_$//g')
+
+	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 | 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 .