client: added option to install 32bit pywin on 64bit system

src/nsi/installer/pywin_installer.py

@@ -9,6 +9,23 @@ import os
 import sys
 import subprocess
 import windowsclasses
+import argparse
+
+
+def parse_arguments():
+    """
+    Argument parser, based on argparse module
+
+    Keyword arguments:
+    @return args -- arguments given by console
+    """
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "change_architect", type=str,
+        help="Whether the 32 bit Python version is installed on a 64bit system",
+        nargs='?', default=False)
+    args = parser.parse_args()
+    return args
 
 
 def main():
@@ -18,31 +35,34 @@ def main():
     Job:
     Install Pywin32 to the computer
     """
+    args = parse_arguments()
     if sys.hexversion < 0x02060000:
         print "Not a 2.6+ version Python is running, commencing update"
         subprocess.Popen(
-            "%s\\no_root_install.bat" % os.path.dirname(
+            "%s\\install.cmd" % os.path.dirname(
                 os.path.realpath(__file__)))
         sys.exit(1)
     else:
         pywin32_version = str(219)
         if sys.hexversion < 0x02070000:
-            if windowsclasses.DecideArchitecture.Is64Windows():
-                subprocess.Popen(
-                    "%s\\x64\\pywin32-%s.win-amd64-py2.6.exe" % (
-                        os.path.dirname(os.path.realpath(__file__)),
-                        pywin32_version)).wait()
+            if (windowsclasses.DecideArchitecture.Is64Windows()
+                and not args.change_architect):
+                    subprocess.Popen(
+                        "%s\\x64\\pywin32-%s.win-amd64-py2.6.exe" % (
+                            os.path.dirname(os.path.realpath(__file__)),
+                            pywin32_version)).wait()
             else:
                 subprocess.Popen(
                     "%s\\x86\\pywin32-%s.win32-py2.6.exe" % (
                         os.path.dirname(os.path.realpath(__file__)),
                         pywin32_version)).wait()
         elif sys.hexversion < 0x02080000:
-            if windowsclasses.DecideArchitecture.Is64Windows():
-                subprocess.Popen(
-                    "%s\\x64\\pywin32-%s.win-amd64-py2.7.exe" % (
-                        os.path.dirname(os.path.realpath(__file__)),
-                        pywin32_version)).wait()
+            if (windowsclasses.DecideArchitecture.Is64Windows()
+                and not args.change_architect):
+                    subprocess.Popen(
+                        "%s\\x64\\pywin32-%s.win-amd64-py2.7.exe" % (
+                            os.path.dirname(os.path.realpath(__file__)),
+                            pywin32_version)).wait()
             else:
                 subprocess.Popen(
                     "%s\\x86\\pywin32-%s.win32-py2.7.exe" % (