# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1274740848 -7200
# Node ID 4cca4300a8eb6fc3f171cca98a41a78526f119ce
# Parent  e33cb1930c02abdf3195fb7ed841d0f90f483d3a
Split the script installation/configuration into separate methods covering each
kind of script.
Tidied up site-packages references.

diff -r e33cb1930c02 -r 4cca4300a8eb moinsetup.py
--- a/moinsetup.py	Mon May 24 22:32:41 2010 +0200
+++ b/moinsetup.py	Tue May 25 00:40:48 2010 +0200
@@ -274,7 +274,8 @@
 
         self.install_data()
         self.configure_moin()
-        self.edit_moin_scripts()
+        self.edit_moin_script()
+        self.edit_moin_web_script()
         self.add_superuser()
         self.make_site_files()
         self.make_post_install_script()
@@ -384,21 +385,23 @@
         if self.theme_default is not None:
             wikiconfig.set("theme_default", self.theme_default)
 
-    def edit_moin_scripts(self):
+    def edit_moin_script(self):
 
-        "Edit the moin script and the CGI script."
+        "Edit the moin script."
 
         moin_script = join(self.prefix, "bin", "moin")
-        prefix_site_packages = join(self.prefix, "lib", "python%s.%s" % sys.version_info[:2], "site-packages")
 
         status("Editing moin script at %s..." % moin_script)
 
         s = readfile(moin_script)
-        s = s.replace("#import sys", "import sys\nsys.path.insert(0, %r)" % prefix_site_packages)
+        s = s.replace("#import sys", "import sys\nsys.path.insert(0, %r)" % self.prefix_site_packages)
 
         writefile(moin_script, s)
 
-        # Edit and install CGI script.
+    def edit_moin_web_script(self):
+
+        "Edit and install CGI script."
+
         # NOTE: CGI only so far.
         # NOTE: Permissions should be checked.
 
@@ -408,7 +411,7 @@
         status("Editing moin.cgi script from %s..." % moin_cgi)
 
         s = readfile(moin_cgi)
-        s = moin_cgi_prefix.sub("sys.path.insert(0, %r)" % prefix_site_packages, s)
+        s = moin_cgi_prefix.sub("sys.path.insert(0, %r)" % self.prefix_site_packages, s)
         s = moin_cgi_wikiconfig.sub("sys.path.insert(0, %r)" % self.conf_dir, s)
 
         writefile(moin_cgi_installed, s)