From 62dcd32011ebdc165ef8945028b265b7dee8bc17 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <oleg.korshul@onlyoffice.com>
Date: Sat, 9 Nov 2019 22:53:05 +0300
Subject: [PATCH] .

---
 .gitignore        |  1 +
 make.py           |  7 ++++---
 scripts/base.py   | 29 ++++++++++++++++-------------
 scripts/build.py  |  7 +++----
 scripts/config.py |  2 +-
 scripts/deploy.py |  1 -
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd0a876..7c64337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ makefiles/
 .qmake.stash
 config
 **/__pycache__
+*.pyc
diff --git a/make.py b/make.py
index ad11159..ba42398 100644
--- a/make.py
+++ b/make.py
@@ -1,3 +1,4 @@
+import sys
 sys.path.append('scripts')
 import config
 import base
@@ -8,7 +9,7 @@ import deploy
 config.parse()
 
 # update
-if ("1" == config.options["update"]):
+if ("1" == config.option("update")):
   base.git_update("core")
   base.git_update("sdkjs")
   base.git_update("sdkjs-plugins")
@@ -17,10 +18,10 @@ if ("1" == config.options["update"]):
   base.git_update("dictionaries")
   base.git_update("core")
 
-  if config.check_option("module", "builder")
+  if config.check_option("module", "builder"):
     base.git_update("DocumentBuilder")
 
-  if config.check_option("module", "desktop")
+  if config.check_option("module", "desktop"):
     base.git_update("desktop-apps")
 
 base_dir = base.get_script_dir()
diff --git a/scripts/base.py b/scripts/base.py
index 7e8455a..0237be7 100644
--- a/scripts/base.py
+++ b/scripts/base.py
@@ -3,6 +3,7 @@ import shutil
 import os
 import subprocess
 import sys
+import config
 
 def get_script_dir():
   scriptPath = os.path.realpath(__file__)
@@ -21,7 +22,9 @@ def is_dir(path):
   return os.path.isdir(get_path(path))
 
 def is_exist(path):
-  return is_file(path) || is_dir(path)
+  if is_file(path) or is_dir(path):
+    return True
+  return False
 
 def copy_file(src, dst):
   return shutil.copy2(get_path(src), get_path(dst))
@@ -44,14 +47,14 @@ def copy_dir(src, dst):
 def delete_dir(path):
   shutil.rmtree(get_path(path))
 
-def cmd(prog, args)
+def cmd(prog, args):
   sub_args = args[:].insert(0, prog)
   ret = subprocess.call(sub_args, stderr=subprocess.STDOUT, shell=True)
   if ret != 0:
     sys.exit("Error (" + prog + "): " + str(ret))
   return ret
 
-def bash(path)
+def bash(path):
   command = get_path(path)
   if ("Windows" == platform.system()):
     command += ".bat"
@@ -60,28 +63,28 @@ def bash(path)
   return cmd(command, [])
 
 def host_platform():
-  ret = platform.system.lower()
+  ret = platform.system().lower()
   if (ret == "darwin"):
     return "mac"
   return ret
 
 def get_env(name):
-  return os.environ.getenv(name, "")
+  return os.getenv(name, "")
 
 def set_env(name, value):
   os.environ[name] = value
   return
 
-def git_update( repo ):
+def git_update(repo):
   url = "https://github.com/ONLYOFFICE/" + repo + ".git"
-  if config.options["git-protocol"] == "ssh":
+  if config.option("git-protocol") == "ssh":
     url = "git@github.com:ONLYOFFICE/" + repo + ".git"
-  folder = base.get_script_dir() + "/../../" + repo
-  if not base.is_dir(folder):
-    base.cmd("git", ["clone", url, folder])
+  folder = get_script_dir() + "/../../" + repo
+  if not is_dir(folder):
+    cmd("git", ["clone", url, folder])
   old_cur = os.getcwd()
   os.chdir(folder)
-  base.cmd("git", ["fetch"])
-  base.cmd("git", ["checkout", "-f", config.options["branch"]])
-  base.cmd("git", ["pull"])
+  cmd("git", ["fetch"])
+  cmd("git", ["checkout", "-f", config.option("branch")])
+  cmd("git", ["pull"])
   os.chdir(old_cur)
\ No newline at end of file
diff --git a/scripts/build.py b/scripts/build.py
index aff8766..9ddd4b1 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -1,4 +1,3 @@
-sys.path.append('scripts')
 import config
 import base
 
@@ -12,7 +11,7 @@ def clean():
       suff2.append(cur + suff_branding)
     suff += suff2
   core_dir = base.get_script_dir() + "/../"
-  for cur in suff
+  for cur in suff:
     base.delete_file(core_dir + "/core/Common/3dParty/cryptopp/project/Makefile.cryptopp" + cur)
     base.delete_file(core_dir + "/core/Common/Makefile.kernel" + cur)
     base.delete_file(core_dir + "/core/UnicodeConverter/Makefile.UnicodeConverter" + cur)
@@ -57,7 +56,7 @@ def make():
     if not platform in config.platforms:
       continue
     is_platform_32 = False
-    if (-1 != platform.find("_32"))
+    if (-1 != platform.find("_32")):
       is_platform_32 = True
 
     platform_base = platform
@@ -71,7 +70,7 @@ def make():
 
     qt_dir = config.option("qt-dir")
     if (-1 != platform.find("xp")):
-      qt-dir = config.option("qt-dir-xp")
+      qt_dir = config.option("qt-dir-xp")
 
     if is_platform_32:
       qt_dir += ("/" + config.options["compiler"])
diff --git a/scripts/config.py b/scripts/config.py
index 3dd78c0..29edcec 100644
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -2,7 +2,7 @@ import base
 import os
 
 def parse():
-  configfile = open(base.get_script_path() + "/../config", "r")
+  configfile = open(base.get_script_dir() + "/../config", "r")
   configOptions = {}
   for line in configfile:
     name, value = line.partition("=")[::2]
diff --git a/scripts/deploy.py b/scripts/deploy.py
index 0624e68..05d32b2 100644
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -1,4 +1,3 @@
-sys.path.append('scripts')
 import config
 import base