Merge pull request #12 from ZihengSun/main

sc

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':
@@ -124,7 +122,7 @@ def set_jdk_env_vars(jdk_install_dir):
 
     if not check_java:
         with open(os.path.expanduser("~/.bashrc"), "a") as bashrc:
-            bashrc.write(f'\nexport JAVA_HOME="{jdk_install_dir}"\n')
+            bashrc.write(f'export JAVA_HOME="{jdk_install_dir}"\n')
             bashrc.write(f'export PATH="$JAVA_HOME/bin:$PATH"\n')
             print('JDK environment variables set.')
 

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 &

pygeoweaver/utils.py

@@ -27,10 +27,12 @@ def get_java_bin_from_which():
     if system == 'Darwin' or system == 'Linux':
 
         try:
-
-            print("Executing: ", f'{get_root_dir()}/java_bin.sh')
 
-            output = subprocess.check_output([f'{get_root_dir()}/java_bin.sh'], encoding='utf-8')
+            java_bin_sh = f'{get_root_dir()}/java_bin.sh'
+
+            os.chmod(java_bin_sh, 0o755)
+
+            output = subprocess.check_output([java_bin_sh], encoding='utf-8')
 
             java_bin_path = output.strip()
 
@@ -68,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
 
 

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="[email protected]" },
 ]
@@ -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"