NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 09:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Strip empty entry in update-alternatives output

Browse Source 
Catch ValueError on missing end quote in java execution command
This commit is contained in:
Zedifus 2022-06-21 19:28:53 +01:00
parent 6fe5d16ded
commit 7379545186
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/classes/web/panel_handler.py
View File

@ -647,8 +647,9 @@ class PanelHandler(BaseHandler):
if temp_version != current_java and version != "java": if temp_version != current_java and version != "java":
page_java.append(version) page_java.append(version)
else: else:
if version != current_java: if len(version) > 0:
page_java.append(version) if version != current_java:
page_java.append(version)
page_data["java_versions"] = page_java page_data["java_versions"] = page_java
@ -1387,8 +1388,15 @@ class PanelHandler(BaseHandler):
server_id = self.check_server_id() server_id = self.check_server_id()
if server_id is None: if server_id is None:
return return
execution_list = shlex.split(execution_command)
if java_selection: if java_selection:
try:
execution_list = shlex.split(execution_command)
except ValueError:
self.redirect(
"/panel/error?error=Invalid execution command. Java path"
" must be surrounded by quotes."
" (Are you missing a closing quote?)"
)
if not any( if not any(
java_selection in path for path in Helpers.find_java_installs() java_selection in path for path in Helpers.find_java_installs()
): ):