From 4b3a7d35967c0398042787b613b1b9572d8383ed Mon Sep 17 00:00:00 2001
From: Sergey Kalinin <banzaj28@yandex.ru>
Date: Mon, 6 Aug 2018 08:44:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B0=D0=BD?=
=?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?=
=?UTF-8?q?=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB?=
=?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=BC=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?=
=?UTF-8?q?=D0=B5=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B5=20=D0=BF=D1=83?=
=?UTF-8?q?=D1=82=D0=B8=20=D0=B4=D0=BE=20rac=20=D0=B2=20windows.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/function.tcl | 1 +
lib/msg/ru.msg | 3 ++-
rac_gui.tcl | 18 +++++++++++++-----
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/lib/function.tcl b/lib/function.tcl
index d8f679d..008e85b 100644
--- a/lib/function.tcl
+++ b/lib/function.tcl
@@ -2378,3 +2378,4 @@ proc Del::inet {tree host profile_name} {
+
diff --git a/lib/msg/ru.msg b/lib/msg/ru.msg
index 95bd3db..e6f6b86 100644
--- a/lib/msg/ru.msg
+++ b/lib/msg/ru.msg
@@ -1,4 +1,4 @@
-::msgcat::mcset ru "Show where is a RAC comand" "Укажите путь до rac"
+::msgcat::mcset ru "Show where is a RAC command" "Укажите путь до rac"
::msgcat::mcset ru "Infobases" "Информационные базы"
::msgcat::mcset ru "Infobase" "Информационная база"
::msgcat::mcset ru "Authorization" "Авторизация"
@@ -111,3 +111,4 @@
::msgcat::mcset ru "Session lock mode management" "Режим блокировки сеансов"
::msgcat::mcset ru "External session management required" "Внешнее управление сеансами"
+
diff --git a/rac_gui.tcl b/rac_gui.tcl
index 64ebcc2..7db8fcb 100755
--- a/rac_gui.tcl
+++ b/rac_gui.tcl
@@ -25,12 +25,17 @@ if {[file exists [file join $dir(work) rac_gui.cfg]] ==0} {
file copy [file join [pwd] rac_gui.cfg] [file join $dir(work) rac_gui.cfg]
}
source [file join $dir(work) rac_gui.cfg]
+
+::msgcat::mclocale $default(locale)
+::msgcat::mcload [file join $dir(lib) msg]
+
# Код проверки наличия rac и правильности указания пути в конфиге
# если программа не найдена то будет выведен диалог для указанием корректного пути
# и этот путь будет записан в пользовательский конфиг
if {[file exists $rac_cmd] == 0} {
- set rac_cmd [tk_getOpenFile -initialdir $env(HOME) -parent . \
- -title [::msgcat::mc "Show where is a RAC comand"] -initialfile rac]
+ set rac_cmd "[tk_getOpenFile -initialdir $env(HOME) -parent . \
+ -title [::msgcat::mc "Show where is a RAC command"] -initialfile rac]"
+ if {$rac_cmd eq ""} {exit}
file copy [file join $dir(work) rac_gui.cfg] [file join $dir(work) rac_gui.cfg.bak]
set orig_file [open [file join $dir(work) rac_gui.cfg.bak] "r"]
set file [open [file join $dir(work) rac_gui.cfg] "w"]
@@ -44,12 +49,15 @@ if {[file exists $rac_cmd] == 0} {
close $file
close $orig_file
#return "$host:$port"
- file delete [file join $dir(work) 1c_srv.cfg.bak]
+ file delete [file join $dir(work) rac_gui.cfg.bak]
+ if {$tcl_platform(platform) == "windows"} {
+ tk_messageBox -message "[::msgcat::mc "Reexecute the programm"]!" \
+ -icon info -type ok
+ exit
+ }
} else {
puts "Found $rac_cmd"
}
-::msgcat::mclocale $default(locale)
-::msgcat::mcload [file join $dir(lib) msg]
set cluster_user ""
set cluster_pwd ""