Renamed cl-createhome to cl_desktop and moved login.d and logout.d scripts

pym/cl_desktop_cmd.py

@@ -38,7 +38,7 @@ DESCRIPTION = _("Create home directory for the new user account")
 CMD_OPTIONS = [{'longOption':"progress",
                 'help':_("show progress bar for xdm startup")}]
 
-class createhome_cmd(share_cmd):
+class desktop_cmd(share_cmd):
     def __init__(self):
         # Объект опций командной строки
         self.optobj = opt(\

scripts/cl-desktop

@@ -21,7 +21,7 @@ sys.path.insert(0,os.path.abspath('/usr/lib/calculate-2.2/calculate-lib/pym'))
 sys.path.insert(0,\
                 os.path.abspath('/usr/lib/calculate-2.2/calculate-desktop/pym'))
 
-from cl_createhome_cmd import createhome_cmd
+from cl_desktop_cmd import desktop_cmd
 
 from cl_lang import lang
 tr = lang()
@@ -29,7 +29,7 @@ tr.setGlobalDomain('cl_desktop')
 tr.setLanguage(sys.modules[__name__])
 
 if __name__ == "__main__":
-    obj = createhome_cmd()
+    obj = desktop_cmd()
     ret = obj.optobj.parse_args()
     if ret is False:
         sys.exit(1)

setup.py

@@ -72,10 +72,12 @@ data_files += [('/usr/share/calculate-2.2/xdm', ['data/cmd_login',
                                                  'data/functions',
                                                  'data/gtkbg',
                                                  'data/xdm'])] +\
-              [('/etc/calculate/xdm/login.d', ['data/login.d/00init',
-                                               'data/login.d/20desktop',
-                                               'data/login.d/99final'])] +\
-              [('/etc/calculate/xdm/logout.d', ['data/logout.d/00init'])] +\
+              [('/usr/share/calculate-2.2/xdm/login.d',
+                                                ['data/login.d/00init',
+                                                'data/login.d/20desktop',
+                                                'data/login.d/99final'])] +\
+              [('/usr/share/calculate-2.2/xdm/logout.d',
+                                                ['data/logout.d/00init'])] +\
               [('/var/calculate/templates', [])]
 
 
@@ -149,7 +151,7 @@ setup(
     package_dir = {'calculate-desktop': "."},
     packages = ['calculate-desktop.pym'],
     data_files = data_files,
-    scripts=["./scripts/cl-createhome",
+    scripts=["./scripts/cl-desktop",
              "./scripts/install",
              "./scripts/uninstall"],
     cmdclass={'install_data': cl_install_data,