From 57e5d9f2d058147f914d5f7c1b9dd8a68661c49d Mon Sep 17 00:00:00 2001 From: Ziheng Sun Date: Mon, 5 Jun 2023 00:20:17 -0400 Subject: [PATCH] update --- pygeoweaver/jdk_utils.py | 2 -- pygeoweaver/start.sh | 1 - pygeoweaver/utils.py | 7 ++----- pyproject.toml | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pygeoweaver/jdk_utils.py b/pygeoweaver/jdk_utils.py index 07d637f..a601fd7 100644 --- a/pygeoweaver/jdk_utils.py +++ b/pygeoweaver/jdk_utils.py @@ -23,8 +23,6 @@ def install_jdk(): print('Unsupported architecture.') elif system == 'Linux': - # https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz - # https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18_10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz if architecture == 'x86_64': install_jdk_linux('11.0.18-10', 'jdk_x64_linux_hotspot') elif architecture == 'aarch64': diff --git a/pygeoweaver/start.sh b/pygeoweaver/start.sh index 44a4fcc..d9f39c8 100755 --- a/pygeoweaver/start.sh +++ b/pygeoweaver/start.sh @@ -5,7 +5,6 @@ pkill -f geoweaver.jar echo "Check Java.." source ~/.bashrc -java -version echo "Start Geoweaver.." nohup java -jar ~/geoweaver.jar > ~/geoweaver.log & diff --git a/pygeoweaver/utils.py b/pygeoweaver/utils.py index 7fedd36..58f2d4a 100644 --- a/pygeoweaver/utils.py +++ b/pygeoweaver/utils.py @@ -29,9 +29,7 @@ def get_java_bin_from_which(): try: java_bin_sh = f'{get_root_dir()}/java_bin.sh' - - print("Executing: ", java_bin_sh) - + os.chmod(java_bin_sh, 0o755) output = subprocess.check_output([java_bin_sh], encoding='utf-8') @@ -72,8 +70,7 @@ def get_java_bin_path(): if java_bin_path is None: java_bin_path = get_java_bin_from_which() - - print("java_bin_path: ", java_bin_path) + return java_bin_path diff --git a/pyproject.toml b/pyproject.toml index 9717659..8ca3ce2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pygeoweaver" -version = "0.6.13" +version = "0.6.14" authors = [ { name="Geoweaver team", email="geoweaver.app@gmail.com" }, ] @@ -22,7 +22,7 @@ classifiers = [ [tool.poetry] name = "pygeoweaver" -version = "0.6.13" +version = "0.6.14" description = "This is a wrapper package of the Geoweaver app." authors = ["Geoweaver team "] readme = "README.md"