From 6863bbdb4149c80e73ea52442f8c5335b8bb359a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Wed, 9 Jun 2010 15:21:46 +0400 Subject: [PATCH] Moved templates --- desktop/system/install/etc/X11/gdm/.calculate_directory | 2 -- desktop/system/install/gdm/.calculate_directory | 1 + desktop/system/install/gdm/PostLogin/.calculate_directory | 1 + desktop/system/install/{etc/X11 => }/gdm/PostLogin/Default | 0 desktop/system/install/gdm/PostSession/.calculate_directory | 1 + desktop/system/install/{etc/X11 => }/gdm/PostSession/00Default | 0 desktop/system/install/{etc/X11 => }/gdm/PostSession/05Default | 0 desktop/system/install/kdm/.calculate_directory | 1 + desktop/system/install/{usr/share/config => }/kdm/kdmrc | 2 +- desktop/system/install/slim/.calculate_directory | 1 + desktop/system/install/{etc => slim}/slim.conf | 2 +- desktop/system/uninstall/.calculate_directory | 2 +- desktop/system/uninstall/etc/X11/gdm/.calculate_directory | 2 -- desktop/system/uninstall/gdm/.calculate_directory | 1 + desktop/system/uninstall/gdm/PostLogin/.calculate_directory | 1 + desktop/system/uninstall/{etc/X11 => }/gdm/PostLogin/Default | 0 desktop/system/uninstall/gdm/PostSession/.calculate_directory | 1 + .../system/uninstall/{etc/X11 => }/gdm/PostSession/00Default | 0 .../system/uninstall/{etc/X11 => }/gdm/PostSession/05Default | 0 desktop/system/uninstall/kdm/.calculate_directory | 1 + desktop/system/uninstall/{usr/share/config => }/kdm/kdmrc | 0 desktop/system/uninstall/slim/.calculate_directory | 1 + desktop/system/uninstall/{etc => slim}/slim.conf | 2 +- pym/cl_desktop.py | 2 ++ pym/cl_vars_desktop.py | 3 +++ 25 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 desktop/system/install/etc/X11/gdm/.calculate_directory create mode 100644 desktop/system/install/gdm/.calculate_directory create mode 100644 desktop/system/install/gdm/PostLogin/.calculate_directory rename desktop/system/install/{etc/X11 => }/gdm/PostLogin/Default (100%) create mode 100644 desktop/system/install/gdm/PostSession/.calculate_directory rename desktop/system/install/{etc/X11 => }/gdm/PostSession/00Default (100%) rename desktop/system/install/{etc/X11 => }/gdm/PostSession/05Default (100%) create mode 100644 desktop/system/install/kdm/.calculate_directory rename desktop/system/install/{usr/share/config => }/kdm/kdmrc (68%) create mode 100644 desktop/system/install/slim/.calculate_directory rename desktop/system/install/{etc => slim}/slim.conf (89%) delete mode 100644 desktop/system/uninstall/etc/X11/gdm/.calculate_directory create mode 100644 desktop/system/uninstall/gdm/.calculate_directory create mode 100644 desktop/system/uninstall/gdm/PostLogin/.calculate_directory rename desktop/system/uninstall/{etc/X11 => }/gdm/PostLogin/Default (100%) create mode 100644 desktop/system/uninstall/gdm/PostSession/.calculate_directory rename desktop/system/uninstall/{etc/X11 => }/gdm/PostSession/00Default (100%) rename desktop/system/uninstall/{etc/X11 => }/gdm/PostSession/05Default (100%) create mode 100644 desktop/system/uninstall/kdm/.calculate_directory rename desktop/system/uninstall/{usr/share/config => }/kdm/kdmrc (100%) create mode 100644 desktop/system/uninstall/slim/.calculate_directory rename desktop/system/uninstall/{etc => slim}/slim.conf (79%) diff --git a/desktop/system/install/etc/X11/gdm/.calculate_directory b/desktop/system/install/etc/X11/gdm/.calculate_directory deleted file mode 100644 index f7451de..0000000 --- a/desktop/system/install/etc/X11/gdm/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate pkg(gnome-base/gdm)!= - diff --git a/desktop/system/install/gdm/.calculate_directory b/desktop/system/install/gdm/.calculate_directory new file mode 100644 index 0000000..256a736 --- /dev/null +++ b/desktop/system/install/gdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip \ No newline at end of file diff --git a/desktop/system/install/gdm/PostLogin/.calculate_directory b/desktop/system/install/gdm/PostLogin/.calculate_directory new file mode 100644 index 0000000..a53849b --- /dev/null +++ b/desktop/system/install/gdm/PostLogin/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/X11/gdm \ No newline at end of file diff --git a/desktop/system/install/etc/X11/gdm/PostLogin/Default b/desktop/system/install/gdm/PostLogin/Default similarity index 100% rename from desktop/system/install/etc/X11/gdm/PostLogin/Default rename to desktop/system/install/gdm/PostLogin/Default diff --git a/desktop/system/install/gdm/PostSession/.calculate_directory b/desktop/system/install/gdm/PostSession/.calculate_directory new file mode 100644 index 0000000..a53849b --- /dev/null +++ b/desktop/system/install/gdm/PostSession/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/X11/gdm \ No newline at end of file diff --git a/desktop/system/install/etc/X11/gdm/PostSession/00Default b/desktop/system/install/gdm/PostSession/00Default similarity index 100% rename from desktop/system/install/etc/X11/gdm/PostSession/00Default rename to desktop/system/install/gdm/PostSession/00Default diff --git a/desktop/system/install/etc/X11/gdm/PostSession/05Default b/desktop/system/install/gdm/PostSession/05Default similarity index 100% rename from desktop/system/install/etc/X11/gdm/PostSession/05Default rename to desktop/system/install/gdm/PostSession/05Default diff --git a/desktop/system/install/kdm/.calculate_directory b/desktop/system/install/kdm/.calculate_directory new file mode 100644 index 0000000..90c5ca4 --- /dev/null +++ b/desktop/system/install/kdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip \ No newline at end of file diff --git a/desktop/system/install/usr/share/config/kdm/kdmrc b/desktop/system/install/kdm/kdmrc similarity index 68% rename from desktop/system/install/usr/share/config/kdm/kdmrc rename to desktop/system/install/kdm/kdmrc index 0b198d5..3110277 100644 --- a/desktop/system/install/usr/share/config/kdm/kdmrc +++ b/desktop/system/install/kdm/kdmrc @@ -1,4 +1,4 @@ -# Calculate format=kde pkg(kde-base/kdm)!= +# Calculate format=kde path=/usr/share/config/kdm [X-*-Core] Reset=/usr/share/calculate-2.2/xdm/xdm --logout Startup=/usr/share/calculate-2.2/xdm/xdm --login diff --git a/desktop/system/install/slim/.calculate_directory b/desktop/system/install/slim/.calculate_directory new file mode 100644 index 0000000..88f85d5 --- /dev/null +++ b/desktop/system/install/slim/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(x11-misc/slim)!= append=skip \ No newline at end of file diff --git a/desktop/system/install/etc/slim.conf b/desktop/system/install/slim/slim.conf similarity index 89% rename from desktop/system/install/etc/slim.conf rename to desktop/system/install/slim/slim.conf index 272381a..aac4c3d 100644 --- a/desktop/system/install/etc/slim.conf +++ b/desktop/system/install/slim/slim.conf @@ -1,4 +1,4 @@ -# Calculate format=proftpd pkg(x11-misc/slim)!= +# Calculate format=proftpd path=/etc login_cmd /usr/share/calculate-2.2/xdm/cmd_login && exec /bin/bash -login /etc/X11/xinit/xinitrc sessionstart_cmd export USER=%user && /usr/share/calculate-2.2/xdm/xdm --login && exec /usr/bin/sessreg -a -l :0.0 %user diff --git a/desktop/system/uninstall/.calculate_directory b/desktop/system/uninstall/.calculate_directory index ac8e15b..d09d2d8 100644 --- a/desktop/system/uninstall/.calculate_directory +++ b/desktop/system/uninstall/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip cl_pass_action==uninstall +# Calculate append=skip cl_pass_action==uninstall \ No newline at end of file diff --git a/desktop/system/uninstall/etc/X11/gdm/.calculate_directory b/desktop/system/uninstall/etc/X11/gdm/.calculate_directory deleted file mode 100644 index f7451de..0000000 --- a/desktop/system/uninstall/etc/X11/gdm/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate pkg(gnome-base/gdm)!= - diff --git a/desktop/system/uninstall/gdm/.calculate_directory b/desktop/system/uninstall/gdm/.calculate_directory new file mode 100644 index 0000000..256a736 --- /dev/null +++ b/desktop/system/uninstall/gdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip \ No newline at end of file diff --git a/desktop/system/uninstall/gdm/PostLogin/.calculate_directory b/desktop/system/uninstall/gdm/PostLogin/.calculate_directory new file mode 100644 index 0000000..a53849b --- /dev/null +++ b/desktop/system/uninstall/gdm/PostLogin/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/X11/gdm \ No newline at end of file diff --git a/desktop/system/uninstall/etc/X11/gdm/PostLogin/Default b/desktop/system/uninstall/gdm/PostLogin/Default similarity index 100% rename from desktop/system/uninstall/etc/X11/gdm/PostLogin/Default rename to desktop/system/uninstall/gdm/PostLogin/Default diff --git a/desktop/system/uninstall/gdm/PostSession/.calculate_directory b/desktop/system/uninstall/gdm/PostSession/.calculate_directory new file mode 100644 index 0000000..a53849b --- /dev/null +++ b/desktop/system/uninstall/gdm/PostSession/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc/X11/gdm \ No newline at end of file diff --git a/desktop/system/uninstall/etc/X11/gdm/PostSession/00Default b/desktop/system/uninstall/gdm/PostSession/00Default similarity index 100% rename from desktop/system/uninstall/etc/X11/gdm/PostSession/00Default rename to desktop/system/uninstall/gdm/PostSession/00Default diff --git a/desktop/system/uninstall/etc/X11/gdm/PostSession/05Default b/desktop/system/uninstall/gdm/PostSession/05Default similarity index 100% rename from desktop/system/uninstall/etc/X11/gdm/PostSession/05Default rename to desktop/system/uninstall/gdm/PostSession/05Default diff --git a/desktop/system/uninstall/kdm/.calculate_directory b/desktop/system/uninstall/kdm/.calculate_directory new file mode 100644 index 0000000..90c5ca4 --- /dev/null +++ b/desktop/system/uninstall/kdm/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip \ No newline at end of file diff --git a/desktop/system/uninstall/usr/share/config/kdm/kdmrc b/desktop/system/uninstall/kdm/kdmrc similarity index 100% rename from desktop/system/uninstall/usr/share/config/kdm/kdmrc rename to desktop/system/uninstall/kdm/kdmrc diff --git a/desktop/system/uninstall/slim/.calculate_directory b/desktop/system/uninstall/slim/.calculate_directory new file mode 100644 index 0000000..88f85d5 --- /dev/null +++ b/desktop/system/uninstall/slim/.calculate_directory @@ -0,0 +1 @@ +# Calculate belong()!=&&pkg(x11-misc/slim)!= append=skip \ No newline at end of file diff --git a/desktop/system/uninstall/etc/slim.conf b/desktop/system/uninstall/slim/slim.conf similarity index 79% rename from desktop/system/uninstall/etc/slim.conf rename to desktop/system/uninstall/slim/slim.conf index ec1e52a..c3bc8e6 100644 --- a/desktop/system/uninstall/etc/slim.conf +++ b/desktop/system/uninstall/slim/slim.conf @@ -1,4 +1,4 @@ -# Calculate format=proftpd pkg(x11-misc/slim)!= +# Calculate format=proftpd path=/etc login_cmd exec /bin/bash -login /etc/X11/xinit/xinitrc sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user diff --git a/pym/cl_desktop.py b/pym/cl_desktop.py index a7e6862..1e5a6cb 100644 --- a/pym/cl_desktop.py +++ b/pym/cl_desktop.py @@ -117,6 +117,7 @@ class install(share): if not self.applyTemplatesFromSystem(): self.printERROR(_("Can not apply install templates")) return False + self.clVars.Write("cl_pass_action", "install", True) self.printOK(_("Apply install templates")) return True @@ -133,6 +134,7 @@ class uninstall(share): if not self.applyTemplatesFromSystem(): self.printERROR(_("Can not apply uninstall templates")) return False + self.clVars.Write("cl_pass_action", "uninstall", True) self.printOK(_("Apply uninstall templates")) return True diff --git a/pym/cl_vars_desktop.py b/pym/cl_vars_desktop.py index 41de1d9..3dbe01b 100644 --- a/pym/cl_vars_desktop.py +++ b/pym/cl_vars_desktop.py @@ -77,3 +77,6 @@ class Data: # Host Jabber пользователя ur_jid_host = {'mode':"w"} + + # Дествие программы - install,uninstall,user + cl_pass_action = {}