X-Git-Url: http://nitlanguage.org

diff --git a/contrib/nitiwiki/src/wiki_base.nit b/contrib/nitiwiki/src/wiki_base.nit
index 21c4f32..70cf35f 100644
--- a/contrib/nitiwiki/src/wiki_base.nit
+++ b/contrib/nitiwiki/src/wiki_base.nit
@@ -50,12 +50,17 @@ class Nitiwiki
 	# Synchronize local output with the distant `WikiConfig::rsync_dir`.
 	fun sync do
 		var root = expand_path(config.root_dir, config.out_dir)
-		sys.system "rsync -vr --delete {root}/ {config.rsync_dir}"
+		var rsync_dir = config.rsync_dir
+		if rsync_dir == "" then
+			message("Error: configure `wiki.rsync_dir` to use rsync.", 0)
+			return
+		end
+		sys.system "rsync -vr --delete -- {root.escape_to_sh}/ {rsync_dir.escape_to_sh}"
 	end
 
 	# Pull data from git repository.
 	fun fetch do
-		sys.system "git pull {config.git_origin} {config.git_branch}"
+		sys.system "git pull {config.git_origin.escape_to_sh} {config.git_branch.escape_to_sh}"
 	end
 
 	# Analyze wiki files from `dir` to build wiki entries.
@@ -146,7 +151,7 @@ class Nitiwiki
 		path = path.simplify_path
 		if entries.has_key(path) then return entries[path].as(WikiSection)
 		var root = expand_path(config.root_dir, config.source_dir)
-		var name = path.basename("")
+		var name = path.basename
 		var section = new WikiSection(self, name)
 		entries[path] = section
 		if path == root then return section
@@ -472,7 +477,7 @@ class WikiSection
 	private fun try_load_config do
 		var cfile = wiki.expand_path(wiki.config.root_dir, src_path, wiki.config_filename)
 		if not cfile.file_exists then return
-		wiki.message("Custom config for section {name}", 1)
+		wiki.message("Custom config for section {name}", 2)
 		config = new SectionConfig(cfile)
 	end
 
@@ -610,9 +615,8 @@ class WikiConfig
 	super ConfigTree
 
 	# Returns the config value at `key` or return `default` if no key was found.
-	private fun value_or_default(key: String, default: String): String do
-		if not has_key(key) then return default
-		return self[key]
+	protected fun value_or_default(key: String, default: String): String do
+		return self[key] or else default
 	end
 
 	# Site name displayed.