Moved templates

desktop/system/install/etc/X11/gdm/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate pkg(gnome-base/gdm)!=
-

desktop/system/install/gdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip

desktop/system/install/gdm/PostLogin/.calculate_directory

@@ -0,0 +1 @@
+# Calculate path=/etc/X11/gdm

desktop/system/install/gdm/PostSession/.calculate_directory

@@ -0,0 +1 @@
+# Calculate path=/etc/X11/gdm

desktop/system/install/kdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip

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

desktop/system/install/slim/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(x11-misc/slim)!= append=skip

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

desktop/system/uninstall/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip cl_pass_action==uninstall
+# Calculate append=skip cl_pass_action==uninstall

desktop/system/uninstall/etc/X11/gdm/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate pkg(gnome-base/gdm)!=
-

desktop/system/uninstall/gdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(gnome-base/gdm)!= append=skip

desktop/system/uninstall/gdm/PostLogin/.calculate_directory

@@ -0,0 +1 @@
+# Calculate path=/etc/X11/gdm

desktop/system/uninstall/gdm/PostSession/.calculate_directory

@@ -0,0 +1 @@
+# Calculate path=/etc/X11/gdm

desktop/system/uninstall/kdm/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(kde-base/kdm)!= append=skip

desktop/system/uninstall/slim/.calculate_directory

@@ -0,0 +1 @@
+# Calculate belong()!=&&pkg(x11-misc/slim)!= append=skip

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

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
 

pym/cl_vars_desktop.py

@@ -77,3 +77,6 @@ class Data:
 
     # Host Jabber пользователя
     ur_jid_host = {'mode':"w"}
+    
+    # Дествие программы - install,uninstall,user
+    cl_pass_action = {}