From 30ba48a895802e8fcd31a6ff320e1fbec6795985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Thu, 27 May 2010 17:52:43 +0400 Subject: [PATCH] Fix build system. --- .../profile/0builder/var/calculate/remote/.keep | 0 install/calculate | 10 ++++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 install/builder/profile/0builder/var/calculate/remote/.keep 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; #базовый суффикс