diff --git a/install/builder/profile/0builder/var/calculate/remote/.keep b/install/builder/profile/0builder/var/calculate/remote/.keep new file mode 100644 index 0000000..e69de29 diff --git a/install/calculate b/install/calculate index 70ca754..d24ab70 100755 --- a/install/calculate +++ b/install/calculate @@ -2541,9 +2541,10 @@ sub checksystem{ # $data{server_url}, $data{server} #---------------------------------------------------------------------- if(!$data{server_url}){ - if(-e "/var/calculate/calculate.env"){ + if(-e "/var/calculate/calculate2.env" || -e "/var/calculate/calculate.env"){ #считаем переменную адреса сервера - open (F, "/var/calculate/calculate.env"); + if(-e "/var/calculate/calculate2.env"){open (F, "/var/calculate/calculate2.env");} + else{open (F, "/var/calculate/calculate.env");} foreach(){ chomp; if(m/^cl_remote_host\s?=\s?(.+)$/){ @@ -2601,8 +2602,9 @@ sub checksystem{ #---------------------------------------------------------------------- - if(-e "/var/calculate/remote/calculate.env"){ - open (F, "/var/calculate/remote/calculate.env"); + if(-e "/var/calculate/calculate2.env" || -e "/var/calculate/calculate.env"){ + if(-e "/var/calculate/calculate2.env"){open (F, "/var/calculate/calculate2.env");} + else{open (F, "/var/calculate/calculate.env");} foreach(){ chomp; #базовый суффикс