Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ZihengSun committed Jun 5, 2023
1 parent 487be11 commit 57e5d9f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 0 additions & 2 deletions pygeoweaver/jdk_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
1 change: 0 additions & 1 deletion pygeoweaver/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Expand Down
7 changes: 2 additions & 5 deletions pygeoweaver/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]" },
]
Expand All @@ -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 <[email protected]>"]
readme = "README.md"
Expand Down

0 comments on commit 57e5d9f

Please sign in to comment.