From 8a14baa3c19e823f19552e8c3caa111193a348db Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Tue, 21 Dec 2010 11:35:40 +0300
Subject: [PATCH] Help restructuring.

---
 i18n/cl_desktop_ru.mo | Bin 3654 -> 3649 bytes
 pym/cl_desktop_cmd.py |  21 +++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/i18n/cl_desktop_ru.mo b/i18n/cl_desktop_ru.mo
index ec3d45f48b274b8179463284f392354b687f66ea..dc11d4cd38d5ae65cc095d4dab3b9ae1e5c1d87b 100644
GIT binary patch
delta 946
zcmZY7%WD%+6u{w=m>8o;8yl;nMmyG4kywjJQS8DNaU+7*;!2{XA%tQ~LK7FdnVRgX
z2s&0>*ndHau^{nLRO&)p%q#?5s8j_X8wD4-5`SkVi0CDEzPV>|A9Kz;O+HGRZ#n`q
zLfb@7(tCX(1GwGKh4u;8;Ad>dU$_q2mWd>A3wGl$>KZ4p3v1Ykv)GFbT#YYL=YK&%
zWL*3KksSm!<5nESIG)2cyo5So7WE+W*n!VbH+tQQ|7^vhL6I171NFc=FE7PS4P*)E
z39HCYu5r;5-9%mZ7V3$g;2>Feg}WHHhrEUM;|Sw1+=nxG6kp&NrdEjL(Zs#@5r?oR
zET*KmIUe>NOyfbui&)3lN}l0W+>PJSz|<=5e}}M#@pT-;CLYFb*pI^zk!@IPc>}d1
zk6Yt+5mRIjfk>2k;Q<`Q0`iiwfLhB%)D7NZ3OmU^iEy(9!g_9LG_9I3P5%Zu@8NF9
zd1NhJ%cU7#Pj{RC+3;><IkLWpb;KVx^^?;oYuo4{yuMo)3hEw<FHXp@kWb;O`P201
z+O%l;MYyf6JXy*c$4ceuM5$Ow8)quHN%4Yud!m>*os*Grxp3B)C{`Lx|B}!85g3YA
zs+mH;C}*;#GWnb}5KPC4JpVh`m=2Enx?1bo3-+8dWzX67?Rlr>OgR_Q*4J<%_U~3!
zf2gk!3q225wTRj6)SdHAjad)uhxTpzE;BD0x|H42Wv)a&B%Hc^hw;7t9$N3C+21!V
BqACCY

delta 979
zcma*lKWGzi6u|KplbBW$|FqTCnwqOtMPf@GMDY(+++0LUMHGr@j4{}zV$wkzl3F@Q
z>>x*7TwEL+il?y>t&Iq!==QrwTq;_fbd{`r-x&%*1%Kq-=kDd*{eJg*_b$2^Ei5$!
zriBqBqC|^NWFLmta9}vtiqCKxen72V#!mG6McQ#UZoxk6!t=NpZ=>Eng%&=>9$dt|
zB17_vlV%bf0g(-O0QH7GY{3iIgd?aE6>&d4M19bE)VdmKT{tMR31fA8?|*47=t`3$
z_{k&(y`hA<;zxLpw|<Eyx&FCU<OKGFL<TU6{kVW>Y-<oXf<-)va~Q{3J-@3_<TTfV
zIDt<Zr67ZxbgvURg!j<G1=PatxD$KVvk>gZGk6zu;!k)MyTb$)P+K%p_hVgOMC35}
zIPSqKcn(XE!k;%^BB2v}!#K9H-@LdtSnSHsHn66Zq2Gn}o|bz()$QF%bP#NsurYs)
zHm)`jtjlXjt8S+bS|qevcp<Ns+IQCCeNZ6myw@6bQnnL22yIb0;{V~hlpM`o&7{X}
zrmXz6l$E=c%cn-H{HT@5=JJW*VX~Q=bt93yo=B(UU&UkD)ynN!;Fx_Xc(MF6c-d!9
zhq~-YL#+HDG!rN|?znr$Et;x%WnLS{a>q?YQ)bq@aZ8qY%YPNio$zvwnWykMg|n7B
uMN!q1O_d_!XpV#<l>F~A%?s1%m^r4JHx->_wMW{=!;|*c@Us0mGV~jMjMWVQ

diff --git a/pym/cl_desktop_cmd.py b/pym/cl_desktop_cmd.py
index 61a9fbe..a7b47e7 100644
--- a/pym/cl_desktop_cmd.py
+++ b/pym/cl_desktop_cmd.py
@@ -35,16 +35,21 @@ EXAMPLES = _("%prog user_name")
 DESCRIPTION = _("Create home directory for the new user account")
 
 # Опции командной строки
-CMD_OPTIONS = [{'longOption':"progress",
-                'help':_("show progress bar for xdm startup")},
-                {'longOption':"install",
-                 'help':_("configure the system to install this package")},
-                {'longOption':"uninstall",
-                 'help':_("configure the system to uninstall this package")}]
+CMD_OPTIONS = [{'longOption':"set"},
+               {'longOption':"install",
+                'help':_("install package")},
+               {'longOption':"uninstall",
+                'help':_("uninstall package")},
+               {'longOption':"progress",
+                'help':_("show progress bar for xdm startup")}]
 
 class desktop_cmd(share_cmd):
     def __init__(self):
         # Объект опций командной строки
+        setpos = \
+            filter(lambda x:x[1].get('longOption')=="set",
+            enumerate(CMD_OPTIONS))[0][0]
+        CMD_OPTIONS[setpos] = opt.variable_set[0]
         self.optobj = opt(\
             package=__app__,
             version=__version__,
@@ -52,7 +57,7 @@ class desktop_cmd(share_cmd):
             examples=EXAMPLES,
             comment_examples=COMMENT_EXAMPLES,
             description=DESCRIPTION,
-            option_list=CMD_OPTIONS + opt.variable_control+opt.color_control,
+            option_list=CMD_OPTIONS + opt.variable_view+opt.color_control,
             check_values=self.checkOpts)
         # Создаем объект логики
         self.logicObj = desktop()
@@ -152,4 +157,4 @@ class desktop_cmd(share_cmd):
 
     def uninstall(self):
         """Удаление программы"""
-        return self.logicObj.uninstallProg()
\ No newline at end of file
+        return self.logicObj.uninstallProg()