Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix windows path escaping

Browse Source
This commit is contained in:
Andrew 2022-01-15 00:58:17 -05:00
parent 6ec2e10a0a
commit 0d8ff36fe4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/classes/shared/main_controller.py
View File

@ -134,7 +134,6 @@ class Controller:
def package_support_logs(self, exec_user):
time.sleep(5)
websocket_helper.broadcast_user(exec_user['user_id'], 'notification', 'Preparing your support logs')
tempDir = tempfile.mkdtemp()
tempZipStorage = tempfile.mkdtemp()
@ -254,6 +253,8 @@ class Controller:
server_file = "{server}-{version}.jar".format(server=server, version=version)
full_jar_path = os.path.join(server_dir, server_file)
if helper.is_os_windows():
full_jar_path.replace(' ', '^ ')
# make the dir - perhaps a UUID?
helper.ensure_dir_exists(server_dir)
@ -324,6 +325,9 @@ class Controller:
f.close()
full_jar_path = os.path.join(new_server_dir, server_jar)
if helper.is_os_windows():
full_jar_path.replace(' ', '^ ')
server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem),
helper.float_to_string(max_mem),
full_jar_path)
@ -357,6 +361,9 @@ class Controller:
f.close()
full_jar_path = os.path.join(new_server_dir, server_jar)
if helper.is_os_windows():
full_jar_path.replace(' ', '^ ')
server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem),
helper.float_to_string(max_mem),
full_jar_path)