Merge branch 'master' of git.calculate.ru:calculate-install

14 years ago · 9ba6187dd3
parent 85d48a0ed1 d7bb967b16
commit 9ba6187dd3
3 changed files with 6 additions and 6 deletions
--- a/data/handbook-en.html
+++ b/data/handbook-en.html
@ -17,7 +17,7 @@ pre {font-size:133% }
 </style>
 </head>
 <body>
-<h1 id="Handbook">Handbook<a href="#Handbook" class="wiki-anchor">&para;</a></h1>
+<h1 id="Installation-Guide">Installation Guide<a href="#Installation-Guide" class="wiki-anchor">&para;</a></h1>


 	<h2 id="Thank-you-for-using-Calculate-Linux">Thank you for using Calculate Linux!<a href="#Thank-you-for-using-Calculate-Linux" class="wiki-anchor">&para;</a></h2>
--- a/data/handbook-ru.html
+++ b/data/handbook-ru.html
@ -17,7 +17,7 @@ pre {font-size:133% }
 </style>
 </head>
 <body>
-<h1 id="Руководство">Руководство<a href="#Руководство" class="wiki-anchor">&para;</a></h1>
+<h1 id="Руководство-по-установке">Руководство по установке<a href="#Руководство-по-установке" class="wiki-anchor">&para;</a></h1>


 	<h2 id="Благодарим-за-использование-Calculate-Linux">Благодарим за использование Calculate Linux!<a href="#Благодарим-за-использование-Calculate-Linux" class="wiki-anchor">&para;</a></h2>
--- a/pym/cl_install_cmd.py
+++ b/pym/cl_install_cmd.py
@ -66,8 +66,7 @@ CMD_OPTIONS = [{'shortOption':"d",
                'choices':['cld','cds','cls','css','cldg','cldx'],
                'help':_("select operation system")
               },
-               {'shortOption':"m",
-                'longOption':"march",
+               {'longOption':"march",
                'optVal':"ARCH",
                'type':'choice',
                'choices':['i686','x86_64'],
@ -268,8 +267,9 @@ class install_cmd(share_cmd):
        """Check and set disk, swap and bind cmd options"""
        if self.optobj.values.s:
            self.logicObj.setLinuxName(self.optobj.values.s.upper())
-        if self.optobj.values.m:
-            self.logicObj.clVars.Set('os_install_arch_machine',self.optobj.values.m)
+        if self.optobj.values.march:
+            self.logicObj.clVars.Set('os_install_arch_machine',
+                                      self.optobj.values.march)
        if self.optobj.values.build:
            self.logicObj.clVars.Set('os_install_scratch',"on",True)
        else: