17 changed files with 23 additions and 102 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +0,0 @@
-debian/.debhelper
-debian/rac-gui
-debian/update-desktop-database
-debian/rac-gui.substvars
-debian/files
-debian/rac-gui.debhelper.log
--- a/README.md
+++ b/README.md
@ -1,9 +1,16 @@
+######################################################
+#                 1C Rac GUI
+# Distributed under GNU Public License
+# Author: Sergey Kalinin svk@nuk-svk.ru
+# http://nuk-svk.ru
+# Home page: https://bitbucket.org/svk28/rac-gui
+######################################################
+
 "Rac GUI" - это графическая оболочка для утилиты управления кластером серверов 1С.
 Для работы требуется Tcl/Tk не ниже 8.6 версии и пакет 1c-server куда входит утилита rac.
 Позволяет работать с несколькими 1С-платформами одновременно.

 http://nuk-svk.ru/soft/rac-gui/
-https://git.nuk-svk.ru/svk/rac-gui.git

 Иконки взяты с сайта https://www.iconsdb.com/royal-blue-icons/

--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@ -1,3 +1,8 @@
+# This is a sample build configuration for Other.
+# Check our guides at https://confluence.atlassian.com/x/5Q4SMw for more examples.
+# Only use spaces to indent your .yml configuration.
+# -----
+# You can specify a custom docker image from Docker Hub as your build environment.
 image: svk28/rac-gui-build:centos8

 pipelines:
--- a/debian/compat
+++ b/debian/compat
@ -1 +1 @@
-10
+8
--- a/debian/install
+++ b/debian/install
@ -4,5 +4,3 @@ 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
--- a/debian/postinst
+++ b/debian/postinst
@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Install the desktop entry
-if hash update-desktop-database 2>/dev/null; then
-        update-desktop-database
-fi
--- a/debian/racgui.desktop
+++ b/debian/racgui.desktop
@ -1,11 +0,0 @@
-[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
--- a/docker/debian/Dockerfile.debian
+++ b/docker/debian/Dockerfile.debian
@ -1,9 +0,0 @@
-FROM debian:buster-slim
-RUN apt-get update \
-    && apt-get install -y locales tcl tk libtcl libtk tcl-dev tk-dev libterm-readline-perl-perl git debhelper \
-    && rm -rf /var/lib/apt/lists/* \
-    && localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8
-
-ENV LANG=ru_RU.utf8
-
-WORKDIR /home/builder
--- a/docker/debian/Dockerfile.rac-gui
+++ b/docker/debian/Dockerfile.rac-gui
@ -1,7 +0,0 @@
-FROM svk28/tcltk-build-debian:10.5
-
-VOLUME /files
-
-ADD build-deb.sh .
-
-CMD git clone https://bitbucket.org/svk28/rac-gui.git && ./build-deb.sh
--- a/docker/debian/build-deb.sh
+++ b/docker/debian/build-deb.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-
-cd rac-gui
-
-VERSION=$(grep Version rac_gui.tcl | grep -oE '\b[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}\b')
-RELEASE=$(grep Release rac_gui.tcl | grep -oE '\b[0-9]{1,3}\b')
-
-mv rac_gui.tcl racgui
-
-sed -i "s+^set\ dir(lib)+set\ dir(lib)\ /usr/share/rac-gui/lib ;#+g" racgui
-   
-sed -i "s+\[pwd\]+/usr/share/rac-gui+g" racgui
-   
-tar czf ../rac-gui_${VERSION}.orig.tar.gz .
-
-dpkg-buildpackage
-
-cp ../rac-gui_${VERSION}-${RELEASE}_amd64.deb /files/
--- a/docker/redhat/Dockerfile.rac-gui
+++ b/docker/redhat/Dockerfile.rac-gui
@ -1,7 +0,0 @@
-FROM svk28/tcltk-build-centos:8
-MAINTAINER svk@nuk-svk.ru
-VOLUME /files
-
-ADD build-rpm.sh .
-
-CMD ./build-rpm.sh
--- a/docker/redhat/Dockerfile.redhat
+++ b/docker/redhat/Dockerfile.redhat
@ -1,10 +0,0 @@
-FROM centos:centos8
-MAINTAINER svk@nuk-svk.ru
-
-RUN dnf update -y && dnf install -y tcl tcl-devel tk tk-devel rpm-build git && dnf clean all
-RUN useradd rpmbuild -u 5002 -g users -p rpmbuild
-USER rpmbuild
-ENV HOME /home/rpmbuild
-WORKDIR /home/rpmbuild
-RUN mkdir -p /home/rpmbuild/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-RUN echo '%_topdir %{getenv:HOME}/rpmbuild' > /home/rpmbuild/.rpmmacros
--- a/docker/redhat/build-rpm.sh
+++ b/docker/redhat/build-rpm.sh
@ -1,21 +0,0 @@
-#!/bin/bash
-
-
-git clone https://bitbucket.org/svk28/rac-gui.git
-WORKDIR=/home/rpmbuild
-
-VERSION=$(grep Version ${WORKDIR}/rac-gui/rac_gui.tcl | grep -oE '\b[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}\b')
-RELEASE=$(grep Release ${WORKDIR}/rac-gui/rac_gui.tcl | grep -oE '\b[0-9]{1,3}\b')
-
-tar czf ${WORKDIR}/rpmbuild/SOURCES/rac-gui-${VERSION}-${RELEASE}.tar.gz rac-gui
-cp ${WORKDIR}/rac-gui/rac_gui.spec ${WORKDIR}/rpmbuild/SPECS/rac_gui.spec
-
-sed -i "s/.*Version:.*/Version:\t${VERSION}/" ${WORKDIR}/rpmbuild/SPECS/rac_gui.spec
-sed -i "s/.*Release:.*/Release:\t${RELEASE}/" ${WORKDIR}/rpmbuild/SPECS/rac_gui.spec
-
-rpmbuild -ba ${WORKDIR}/rpmbuild/SPECS/rac_gui.spec
-
-#exit
-
-cp ${WORKDIR}/rpmbuild/RPMS/noarch/rac-gui-${VERSION}-${RELEASE}.noarch.rpm /files/
-cp ${WORKDIR}/rpmbuild/SRPMS/rac-gui-${VERSION}-${RELEASE}.src.rpm /files/
--- a/lib/config.tcl
+++ b/lib/config.tcl
@ -48,6 +48,8 @@ proc GetAgentPassword {host} {
    }
 }

+
+
 # Конвертация словаря в удобочитаемый формат

 proc DictFormatter {dict {indent}} {
@ -168,6 +170,7 @@ proc GetDictFromString {str indent} {
    }
 }

+
 # Проверка установки переменных в конфиге
 proc CheckVariablesSet {} {
    global default dir
@ -205,5 +208,6 @@ 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]
-    }
+    } 
+    
 }
--- 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 ""
    }
--- a/rac_gui.spec
+++ b/rac_gui.spec
@ -77,3 +77,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
 - Initial release
+
--- a/rac_gui.tcl
+++ b/rac_gui.tcl
@ -31,7 +31,7 @@ close $f
 package require msgcat

 # Устанавливаем текущий каталог
-set dir(root) /usr/share/rac-gui
+set dir(root) [pwd]

 set dir(doc) [file join $dir(root) doc]

@ -124,3 +124,4 @@ if [file exists [file join $dir(work) 1c_srv_new.cfg]] {
 } else {
    set servers_list ""
 }
+