|
|
|
|
@ -22,7 +22,7 @@ use Time::Local;
|
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
|
|
|
my %data; #объявим хэш переменных
|
|
|
|
|
$data{"calcver"} = "1.3.3";
|
|
|
|
|
$data{"calcver"} = "1.3.4";
|
|
|
|
|
|
|
|
|
|
#Определим путь к программе
|
|
|
|
|
if(!getpath()){exit;};
|
|
|
|
|
@ -529,7 +529,7 @@ sub getarg{
|
|
|
|
|
printmes(" -U, --updateonly\t"); printmes(gettext('perform updates only')."\n");
|
|
|
|
|
printmes(" --set-[var]=value\t"); printmes(gettext('set config files parameter')."\n");
|
|
|
|
|
printmes(" --SET-[var]=value\t"); printmes(gettext('set config files parameter without check')."\n");
|
|
|
|
|
printmes(" -P, --profile=name[,name2...]\t"); printmes(gettext('apply configuration profile (all - all profiles)')."\n");
|
|
|
|
|
printmes(" -P, --profile=name[,name2...]\t"); printmes(gettext('apply configuration template (all - all templates)')."\n");
|
|
|
|
|
|
|
|
|
|
printmes("\n".gettext('System building').":\n");
|
|
|
|
|
printmes(" -l, --list\t\t"); printmes(gettext('show the package list incoming in the distributive file')."\n");
|
|
|
|
|
@ -2625,7 +2625,7 @@ sub checksystem{
|
|
|
|
|
# @{$data{profile_install}}, @{$data{profile_share}}
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
if(!$data{builder} && $data{type} ne "flash"){
|
|
|
|
|
printmes(gettext('Installation profiles')."\n");
|
|
|
|
|
printmes(gettext('Installation templates')."\n");
|
|
|
|
|
{
|
|
|
|
|
#считаем базовые профили установки
|
|
|
|
|
my %profiles;
|
|
|
|
|
@ -3719,8 +3719,8 @@ sub profile{
|
|
|
|
|
|
|
|
|
|
if(!$title){ $title = $profile; $title =~s/.+\/([^\/]+)\/[^\/]+\/([^\/]+)$/$1\/$2/; }
|
|
|
|
|
$title=~s/^(.+)\?(.+)/$1/;
|
|
|
|
|
printmes(" ".gettext('Apply profile')); printmes(" \"$title\"...");
|
|
|
|
|
#Profile file
|
|
|
|
|
printmes(" ".gettext('Apply template')); printmes(" \"$title\"...");
|
|
|
|
|
#Template file
|
|
|
|
|
$data{title} =
|
|
|
|
|
$data{mesline}."\n".
|
|
|
|
|
$data{mestitle}."\n".
|
|
|
|
|
@ -4862,7 +4862,7 @@ sub update_profile{
|
|
|
|
|
|
|
|
|
|
if($profile=~m/[^0-9a-z\/_\-*]/i){
|
|
|
|
|
printmes(gettext('Error')."! ");
|
|
|
|
|
printmes(gettext('Invalid profile')); printmes(" \"$_\".\n");
|
|
|
|
|
printmes(gettext('Invalid template')); printmes(" \"$_\".\n");
|
|
|
|
|
return ""
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -4880,14 +4880,14 @@ sub update_profile{
|
|
|
|
|
push (@{$data{setprof}}, "/usr/calculate/share/profile/$profile");
|
|
|
|
|
}else{
|
|
|
|
|
printmes(gettext('Error')."! ");
|
|
|
|
|
printmes(gettext('Invalid profile')); printmes(" \"$_\".\n");
|
|
|
|
|
printmes(gettext('Invalid template')); printmes(" \"$_\".\n");
|
|
|
|
|
return ""
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(!@{$data{setprof}}){
|
|
|
|
|
printmes(gettext('Error')."! ");
|
|
|
|
|
printmes(gettext('Configuration profile is not specified')); printmes(".\n");
|
|
|
|
|
printmes(gettext('Configuration template is not specified')); printmes(".\n");
|
|
|
|
|
return ""
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
