Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

debian/changelog

@@ -12,6 +12,8 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
     always to add.
   * Start moving admin preferences from the web interface to the setup file.
+  * ikiwiki-makerepo: Bail if both srcdir and repository are not specified.
+    Closes: #493628
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 

ikiwiki-makerepo

@@ -4,7 +4,7 @@ set -e
 rcs="$1"
 srcdir="$2"
 repository="$3"
-	
+
 usage () {
 	echo "usage: ikiwiki-makerepo svn|git srcdir repository" >&2
 	echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
@@ -21,6 +21,10 @@ if [ ! -d "$srcdir" ]; then
 fi
 
 if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
+	if [ -z "$repository" ]; then
+		echo "you need to specify both a srcdir and a repository for $rcs" >&2
+		usage
+	fi
 	if [ -e "$repository" ]; then
 		echo "repository $repository already exists, aborting" >&2 
 		exit 1