diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py index 87b81eb..55bf3a4 100644 --- a/pym/cl_fill_install.py +++ b/pym/cl_fill_install.py @@ -19,7 +19,7 @@ import re from cl_datavars import glob_attr class fillVars(object, glob_attr): - def get_cl_profile_path(self): + def get_cl_template_path(self): """list appied templates""" profpath = [] profPaths=['/usr/lib/calculate-2.2/calculate-install/templates', diff --git a/pym/cl_install.py b/pym/cl_install.py index c950de8..fa80363 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -74,8 +74,9 @@ class cl_install(color_print): """Apply templates for root of system.""" self.clVars.Set("cl_root_path","/", True) self.clTemp = template(self.clVars) - dirsFiles = self.clTemp.applyProfiles() + dirsFiles = self.clTemp.applyTemplates() if self.clTemp.getError(): + self.printERROR(self.clTemp.getError()) return False else: return dirsFiles diff --git a/pym/cl_vars_install.py b/pym/cl_vars_install.py index 9df449b..ca1e0db 100644 --- a/pym/cl_vars_install.py +++ b/pym/cl_vars_install.py @@ -23,7 +23,7 @@ class Data: # list of applied templates - cl_profile_path = {} + cl_template_path = {} # relative path for apply templates on files of system cl_root_path = {} diff --git a/pym/install_opt.py b/pym/install_opt.py index 1311957..da9f193 100644 --- a/pym/install_opt.py +++ b/pym/install_opt.py @@ -70,7 +70,7 @@ Utility for installation and configuration of Calculate Linux"""), for val in vals.split(','): k,o,v = val.partition('=') if self.clVars.exists(k): - if not self.clVars.Set(k,v): + if not self.clVars.SetWriteVar(k,v): return False else: self.printERROR(_('variable %s not found')%k) @@ -110,7 +110,11 @@ Utility for installation and configuration of Calculate Linux"""), self.processDisplayVars(options.vars) return True elif not options.T is None: - return self.applyTemplatesForSystem() + if self.applyTemplatesForSystem(): + self.clVars.WriteVars() + return True + else: + return False else: return False