Убраны зависимости на json и tcllib

This commit is contained in:
Sergey 2019-08-24 14:54:32 +03:00
parent 172e02494c
commit 7426f036fb
4 changed files with 6 additions and 49 deletions

3
debian/control vendored
View File

@ -9,8 +9,9 @@ Vcs-Git: https://bitbucket.org/svk28/rac-gui.git
Package: rac-gui Package: rac-gui
Architecture: any Architecture: any
Depends: tcl(>=8.6), tk(>=8.6), tcllib, ${misc:Depends} Depends: tcl(>=8.6), tk(>=8.6), ${misc:Depends}
Description: This program is a GUI for 1C RAC util. Description: This program is a GUI for 1C RAC util.
Rac-GUI is a graphical user interface for 1C rac (remote access controll) programm. Rac-GUI is a graphical user interface for 1C rac (remote access controll) programm.
1C RAC is a software for 1C-servers cluster management. 1C RAC is a software for 1C-servers cluster management.

View File

@ -340,50 +340,6 @@ proc GetWorkTreeRow {} {
return $lst return $lst
} }
proc JsonGet {json args} {
foreach key $args {
if {[dict exists $json $key]} {
set json [dict get $json $key]
} elseif {[string is integer $key]} {
if {$key >= 0 && $key < [llength $json]} {
set json [lindex $json $key]
} else {
error "can't get item number $key from {$json}"
}
} else {
error "can't get \"$key\": no such key in {$json}"
}
}
return $json
}
proc CreateInfoBasesJSONfile {} {
global default dir
set info_base_json_file [file join $dir(work) infobases.lst]
set jsonStr { \
{
"servers":[
{ "server-id": "server_id1",
"clusters": [
{"cluster-id": "cluster_id_1", "infobases": [
{"infobase-uid": "infobase_uid_1", "infobase-user":"infobase_user", "infobase-pwd":"infobase_pwd"},
{"infobase-uid": "infobase_uid_2", "infobase-user":"infobase_user", "infobase-pwd":"infobase_pwd"}]
}
]
},
{ "server-id": "server_id2",
"clusters": [
{"cluster-id": "cluster_id_1", "infobases": [
{"infobase-uid": "infobase_uid_1", "infobase-user":"infobase_user", "infobase-pwd":"infobase_pwd"},
{"infobase-uid": "infobase_uid_2", "infobase-user":"infobase_user", "infobase-pwd":"infobase_pwd"}]
}
]}
]}
}
}
namespace eval Run {} {} namespace eval Run {} {}
# Получение данных по кластерам # Получение данных по кластерам
@ -2479,3 +2435,4 @@ proc Del::inet {tree host profile_name} {

View File

@ -7,7 +7,7 @@ Group: System
Url: https://bitbucket.org/svk28/rac-gui Url: https://bitbucket.org/svk28/rac-gui
BuildArch: noarch BuildArch: noarch
Source: %name-%version-%release.tar.gz Source: %name-%version-%release.tar.gz
Requires: tcl => 8.6.8, tk >= 8.6.8, tcllib Requires: tcl => 8.6.8, tk >= 8.6.8
%description %description
This program ia a grafics user interface for 1C rac util. This program ia a grafics user interface for 1C rac util.
@ -69,3 +69,4 @@ install -p -m644 lib/msg/*.* $RPM_BUILD_ROOT%_datadir/%name/lib/msg/
* Mon Aug 06 2018 Sergey Kalinin <svk@nuk-svk.ru> 1.0.0 * Mon Aug 06 2018 Sergey Kalinin <svk@nuk-svk.ru> 1.0.0
- Initial release - Initial release

View File

@ -3,8 +3,7 @@
exec wish "$0" -- "$@" exec wish "$0" -- "$@"
package require msgcat package require msgcat
package require json
package require json::write
###################################################### ######################################################
# Rac GUI # Rac GUI
@ -115,4 +114,3 @@ if [file exists [file join $dir(work) 1c_srv.cfg]] {
# option add *ScrollableFrame.Background $editor(bg) interactive # option add *ScrollableFrame.Background $editor(bg) interactive
# option add *ScrolledWindow.Background $editor(bg) interactive # option add *ScrolledWindow.Background $editor(bg) interactive
CreateInfoBasesJSONfile