# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1274833303 -7200
# Node ID 866ec2faae57b94aabb0cdf74e0d8e649be0e479
# Parent  81cf24ef084c1179ea69d808f07315df56d344f9
Fixed URL path normalisation.

diff -r 81cf24ef084c -r 866ec2faae57 TO_DO.txt
--- a/TO_DO.txt	Wed May 26 02:06:08 2010 +0200
+++ b/TO_DO.txt	Wed May 26 02:21:43 2010 +0200
@@ -1,3 +1,4 @@
+Avoid reconfiguration of existing moin script.
 Site directory detection.
 Enabled/available site listings.
 HTTP user integration and Apache user/group file editing.
diff -r 81cf24ef084c -r 866ec2faae57 moinsetup.py
--- a/moinsetup.py	Wed May 26 02:06:08 2010 +0200
+++ b/moinsetup.py	Wed May 26 02:21:43 2010 +0200
@@ -205,7 +205,7 @@
 
         # Strip any trailing "/" from the URL path.
 
-        if url_path.endswith("/"):
+        if url_path != "/" and url_path.endswith("/"):
             self.url_path = url_path[:-1]
         else:
             self.url_path = url_path
@@ -404,7 +404,7 @@
             # /         -> /moin_static187
             # /hgwiki   -> /hgwiki/moin_static187
 
-            self.static_url_path = self.url_path + "/" + self.get_static_identifier()
+            self.static_url_path = self.url_path + (self.url_path != "/" and "/" or "") + self.get_static_identifier()
             url_prefix_static = "%r" % self.static_url_path
 
         # Copy the Wiki configuration file from the distribution.