Minor bugs fixed in scripts

Author: Liby99

scripts/fetch_one.py

@@ -9,7 +9,7 @@
 Example:
 
 ``` bash
-$ python fetch_one.py apache__camel_CVE-2018-8041_2.20.3
+$ python3 fetch_one.py apache__camel_CVE-2018-8041_2.20.3
 ```
 """
 

scripts/jdk_version.json

@@ -1,6 +1,6 @@
 {
   "17": {
-    "tar_file": "jdk-17_linux-x64.tar.gz",
+    "tar_file": "jdk-17_linux-x64_bin.tar.gz",
     "dir": "jdk-17.0.12"
   },
   "7u80": {

scripts/setup.py

@@ -10,11 +10,11 @@ def fetch_and_build_one(payload):
   (project, no_build) = payload
   project_slug = project[1]
   print(f"== Processing {project_slug} ==")
-  output = subprocess.run(["python", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/fetch_one.py", project_slug])
+  output = subprocess.run(["python3", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/fetch_one.py", project_slug])
   if output.returncode != 0:
     return
   if not no_build:
-    output = subprocess.run(["python", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/build_one.py", project_slug])
+    output = subprocess.run(["python3", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/build_one.py", project_slug])
     if output.returncode != 0:
       return
     print(f"== Done fetching and building {project_slug} ==")
@@ -52,15 +52,15 @@ def parallel_fetch_and_build(projects, no_build):
 
   if not args.no_build:
     print(f"====== Setting up JDK ======")
-    output = subprocess.run(["python", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/setup_jdk.py"])
+    output = subprocess.run(["python3", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/setup_jdk.py"])
     if output.returncode != 0: print(f"Failed; aborting"); exit(1)
 
     print(f"====== Setting up Maven ======")
-    output = subprocess.run(["python", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/setup_mvn.py"])
+    output = subprocess.run(["python3", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/setup_mvn.py"])
     if output.returncode != 0: print(f"Failed; aborting"); exit(1)
 
     print(f"====== Setting up Gradle ======")
-    output = subprocess.run(["python", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/setup_gradle.py"])
+    output = subprocess.run(["python3", f"{CWE_BENCH_JAVA_ROOT_DIR}/scripts/setup_gradle.py"])
     if output.returncode != 0: print(f"Failed; aborting"); exit(1)
 
   print(f"====== Fetching and Building Repositories ======")

scripts/setup_jdk.py

@@ -13,11 +13,11 @@ def setup_jdk(version, info):
   if os.path.exists(f"{JAVA_ENV_DIR}/{info['dir']}"):
     print(f">> [CWE-Bench-Java/setup_jdk] JDK version {version} found; skipping")
   else:
-    if not os.path.exists(f"{JAVA_ENV_DIR}/{info['tar']}"):
-      print(f">> [CWE-Bench-Java/setup_jdk] JDK tar {info['tar']} NOT found; skipping")
+    if not os.path.exists(f"{JAVA_ENV_DIR}/{info['tar_file']}"):
+      print(f">> [CWE-Bench-Java/setup_jdk] JDK tar {info['tar_file']} NOT found; skipping")
 
     print(f">> [CWE-Bench-Java/setup_jdk] Un-tar-ing JDK Binary {version}...")
-    output = subprocess.run(["tar", "xzvf", info["zip_file"]], cwd=JAVA_ENV_DIR)
+    output = subprocess.run(["tar", "xzvf", f"{info['tar_file']}"], cwd=JAVA_ENV_DIR)
     if output.returncode != 0:
       print(f">> [CWE-Bench-Java/setup_jdk] failed...")
       exit(1)