From adc353cdcc791463223d260270b1f061ff4f8122 Mon Sep 17 00:00:00 2001 From: Levi Zim Date: Sun, 29 Sep 2024 21:46:41 +0800 Subject: [PATCH] refactor: remove semicolon from python scripts Semicolons are unnecessary when there's only one statement on a single line. --- develop/run_build_js.py | 6 +++--- scripts/base.py | 4 ++-- scripts/build_js.py | 2 +- scripts/core_common/modules/boost.py | 4 ++-- scripts/core_common/modules/glew.py | 4 ++-- scripts/core_common/modules/v8.py | 6 +++--- scripts/deploy_desktop.py | 2 +- scripts/sln.py | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/develop/run_build_js.py b/develop/run_build_js.py index 31cbc4f..288208b 100644 --- a/develop/run_build_js.py +++ b/develop/run_build_js.py @@ -8,7 +8,7 @@ import run_server import config import base -git_dir = sys.argv[1]; +git_dir = sys.argv[1] base.print_info('argv :'+' '.join(sys.argv)) base.cmd_in_dir(git_dir + '/build_tools/', 'python3', ['configure.py', '--develop', '1'] + sys.argv[2:]) @@ -18,7 +18,7 @@ config.parse_defaults() if base.is_exist(git_dir + "/server/FileConverter/bin/fonts.log"): base.print_info('remove font cache to regenerate fonts in external sdkjs volume') - base.delete_file(git_dir + "/server/FileConverter/bin/fonts.log"); + base.delete_file(git_dir + "/server/FileConverter/bin/fonts.log") # external server volume if base.is_exist(sys.argv[1] + '/server/DocService/package.json'): @@ -28,7 +28,7 @@ if base.is_exist(sys.argv[1] + '/server/DocService/package.json'): base.replaceInFileRE("/etc/supervisor/conf.d/ds-converter.conf", "command=.*", "command=node " + git_dir + "/server/FileConverter/sources/convertermaster.js") base.replaceInFileRE("/app/ds/setup/config/supervisor/ds/ds-converter.conf", "command=.*", "command=node " + git_dir + "/server/FileConverter/sources/convertermaster.js") base.print_info('run_server.run_docker_server') - run_server.run_docker_server(); + run_server.run_docker_server() else: #Fix theme generation for external sdkjs volume if base.is_exist(git_dir + "/server/FileConverter/bin/DoctRenderer.config"): diff --git a/scripts/base.py b/scripts/base.py index afcc778..fd418ad 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -608,7 +608,7 @@ def update_repositories(repositories): git_update(repo, value[0], False) else: if is_dir(current_dir + "/.git"): - delete_dir_with_access_error(current_dir); + delete_dir_with_access_error(current_dir) delete_dir(current_dir) if not is_dir(current_dir): create_dir(current_dir) @@ -1567,7 +1567,7 @@ def restorePathForBuilder(new_path): old_path = new_path[:-4] delete_file(old_path) copy_file(new_path, old_path) - delete_file(new_path); + delete_file(new_path) return def generate_check_linux_system(build_tools_dir, out_dir): diff --git a/scripts/build_js.py b/scripts/build_js.py index 0b24fa3..976ad16 100644 --- a/scripts/build_js.py +++ b/scripts/build_js.py @@ -33,7 +33,7 @@ def make(): base.set_env('NODE_ENV', 'production') base_dir = base.get_script_dir() + "/.." - out_dir = base_dir + "/out/js/"; + out_dir = base_dir + "/out/js/" branding = config.option("branding-name") if ("" == branding): branding = "onlyoffice" diff --git a/scripts/core_common/modules/boost.py b/scripts/core_common/modules/boost.py index b20e341..9089b4a 100644 --- a/scripts/core_common/modules/boost.py +++ b/scripts/core_common/modules/boost.py @@ -22,10 +22,10 @@ def move_debug_libs_windows(dir): def clean(): if base.is_dir("boost_1_58_0"): - base.delete_dir_with_access_error("boost_1_58_0"); + base.delete_dir_with_access_error("boost_1_58_0") base.delete_dir("boost_1_58_0") if base.is_dir("boost_1_72_0"): - base.delete_dir_with_access_error("boost_1_72_0"); + base.delete_dir_with_access_error("boost_1_72_0") base.delete_dir("boost_1_72_0") if base.is_dir("build"): base.delete_dir("build") diff --git a/scripts/core_common/modules/glew.py b/scripts/core_common/modules/glew.py index c5c37cf..a9e2be7 100644 --- a/scripts/core_common/modules/glew.py +++ b/scripts/core_common/modules/glew.py @@ -8,7 +8,7 @@ import os def clean(): if base.is_dir("glew-2.1.0"): - base.delete_dir("glew-2.1.0"); + base.delete_dir("glew-2.1.0") return def make(): @@ -16,7 +16,7 @@ def make(): return if not config.check_option("module", "mobile"): - return; + return print("[fetch & build]: glew") base_dir = base.get_script_dir() + "/../../core/Common/3dParty/glew" diff --git a/scripts/core_common/modules/v8.py b/scripts/core_common/modules/v8.py index aa71add..b907e71 100644 --- a/scripts/core_common/modules/v8.py +++ b/scripts/core_common/modules/v8.py @@ -10,10 +10,10 @@ import v8_89 def clean(): if base.is_dir("depot_tools"): - base.delete_dir_with_access_error("depot_tools"); + base.delete_dir_with_access_error("depot_tools") base.delete_dir("depot_tools") if base.is_dir("v8"): - base.delete_dir_with_access_error("v8"); + base.delete_dir_with_access_error("v8") base.delete_dir("v8") if base.is_exist("./.gclient"): base.delete_file("./.gclient") @@ -269,7 +269,7 @@ def make_xp(): "for file in projects:", " replaceInFile(file, 'MultiThreadedDebug', 'MultiThreadedDebugDLL')", " replaceInFile(file, 'MultiThreaded', 'MultiThreadedDLL')", - ]); + ]) programFilesDir = base.get_env("ProgramFiles") if ("" != base.get_env("ProgramFiles(x86)")): diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py index ddebcde..213f2b3 100644 --- a/scripts/deploy_desktop.py +++ b/scripts/deploy_desktop.py @@ -40,7 +40,7 @@ def make(): isWindowsXP = False if (-1 == native_platform.find("_xp")) else True platform = native_platform[0:-3] if isWindowsXP else native_platform - apps_postfix = "build" + base.qt_dst_postfix(); + apps_postfix = "build" + base.qt_dst_postfix() if ("" != config.option("branding")): apps_postfix += ("/" + config.option("branding")) apps_postfix += "/" diff --git a/scripts/sln.py b/scripts/sln.py index fc7e10a..4a27963 100644 --- a/scripts/sln.py +++ b/scripts/sln.py @@ -128,7 +128,7 @@ def get_projects(pro_json_path, platform): is_needed_platform_exist = False for pl in platform_records: if is_exist_in_array(params, pl): - is_needed_platform_exist = True; + is_needed_platform_exist = True break # if one config exists => all needed must exists @@ -139,7 +139,7 @@ def get_projects(pro_json_path, platform): if is_exist_in_array(platform_records, item): continue is_needed_config_exist = True - break; + break if is_needed_platform_exist: if not is_exist_in_array(params, platform):