Use wizard.shell

[wizard.git] / wizard / app / mediawiki.py

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index 01c931a2dbe9ca1e4720d3401e600ddc48c7d650..1505fa17d63647f7890ba01832c4c7c5628d0ffc 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -34,14 +34,15 @@ class Application(app.Application):
     substitutions = app.make_substitutions(seed)
     substitutions.update(php.substitutions)
     install_schema = install.ArgSchema("db", "admin", "email", "title")
+    def download(self, version):
+        series = ".".join(str(version).split(".")[:2])
+        return "http://download.wikimedia.org/mediawiki/%s/mediawiki-%s.tar.gz" % (series, version)
     def checkConfig(self, deployment):
         return os.path.isfile("LocalSettings.php")
     def detectVersion(self, deployment):
         return self.detectVersionFromFile("includes/DefaultSettings.php", php.re_var("wgVersion"))
     def checkWeb(self, deployment):
-        return self.checkWebPage(deployment, "/index.php?title=Main_Page", "<!-- Served")
-    def prepareMerge(self, deployment):
-        resolve.fix_newlines("LocalSettings.php")
+        return self.checkWebPage(deployment, "/index.php?title=Main_Page", outputs=["<!-- Served"])
     def install(self, version, options):
         util.soft_unlink("LocalSettings.php")
         os.chmod("config", 0777) # XXX: vaguely sketchy