diff --git a/debian/install b/debian/install index 6374311..f36b43f 100644 --- a/debian/install +++ b/debian/install @@ -4,3 +4,5 @@ rac_gui.cfg /usr/share/rac-gui/ rac_gui.png /usr/share/rac-gui/ lib/msg/* /usr/share/rac-gui/lib/msg doc/racgui_manual.txt /usr/share/doc/rac-gui +debian/racgui.desktop /usr/share/applications +rac_gui.png /usr/share/pixmaps \ No newline at end of file diff --git a/debian/racgui.desktop b/debian/racgui.desktop new file mode 100644 index 0000000..fe254b8 --- /dev/null +++ b/debian/racgui.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=RacGui +GenericName=RacGUI tools +Comment=Rac-GUI is a graphical user interface for 1C rac (remote access controll) programm. +Exec=racgui +Terminal=false +Type=Application +StartupNotify=true +MimeType=text/plain; +Categories=Development; +Icon=rac_gui diff --git a/lib/config.tcl b/lib/config.tcl index 0addc82..7e52b31 100644 --- a/lib/config.tcl +++ b/lib/config.tcl @@ -48,8 +48,6 @@ proc GetAgentPassword {host} { } } - - # Конвертация словаря в удобочитаемый формат proc DictFormatter {dict {indent}} { @@ -170,7 +168,6 @@ proc GetDictFromString {str indent} { } } - # Проверка установки переменных в конфиге proc CheckVariablesSet {} { global default dir @@ -208,6 +205,5 @@ proc CopyNewConfig {} { if {[file exists [file join $dir(work) rac_gui.cfg]] ==1} { file rename -force [file join $dir(work) rac_gui.cfg] [file join $dir(work) rac_gui.cfg.old] file copy [file join $dir(root) rac_gui.cfg] [file join $dir(work) rac_gui.cfg] - } - + } } diff --git a/lib/function.tcl b/lib/function.tcl index 2570076..728f923 100644 --- a/lib/function.tcl +++ b/lib/function.tcl @@ -275,7 +275,7 @@ proc InsertProfileItems {tree id} { proc GetInfobases {cluster host} { global active_cluster cluster_user cluster_pwd auth if {$cluster_user ne "" && $cluster_pwd ne ""} { - set auth "--cluster-user=$cluster_user --cluster-pwd=$cluster_pwd" + set auth "--cluster-user=\"$cluster_user\" --cluster-pwd=\"$cluster_pwd\"" } else { set auth "" } diff --git a/rac_gui.spec b/rac_gui.spec index 773c03e..91b855b 100644 --- a/rac_gui.spec +++ b/rac_gui.spec @@ -77,4 +77,3 @@ install -p -m644 lib/msg/*.* $RPM_BUILD_ROOT%_datadir/%name/lib/msg/ * Mon Aug 06 2018 Sergey Kalinin 1.0.0 - Initial release - diff --git a/rac_gui.tcl b/rac_gui.tcl index 3ddffaa..8f57e9b 100755 --- a/rac_gui.tcl +++ b/rac_gui.tcl @@ -31,7 +31,7 @@ close $f package require msgcat # Устанавливаем текущий каталог -set dir(root) [pwd] +set dir(root) /usr/share/rac-gui set dir(doc) [file join $dir(root) doc] @@ -68,7 +68,7 @@ if {[file exists [file join $env(HOME) .rac_gui]] ==1 && $dir(work) ne [file joi puts "Work dir is $dir(work)" # каталог с модулями -set dir(lib) "[file join $dir(root) lib]" +set dir(lib) /usr/share/rac-gui/lib ;# /usr/share/rac-gui/lib ;# "[file join $dir(root) lib]" # загружаем пользовательский конфиг, если он отсутствует, то копируем дефолтный if {[file exists [file join $dir(work) rac_gui.cfg]] ==0} { @@ -124,4 +124,3 @@ if [file exists [file join $dir(work) 1c_srv_new.cfg]] { } else { set servers_list "" } -