fixes for python version

This commit is contained in:
Mathew Guest
2021-08-19 19:35:05 -06:00
parent 92bf222868
commit be9dc63a00
13 changed files with 18 additions and 148 deletions
+2
View File
@@ -1,4 +1,5 @@
from . import hub_machine
from . import datalayer
import app_skellington
from app_skellington import _util
@@ -36,6 +37,7 @@ class SmileyFace(app_skellington.ApplicationContainer):
def _services(self):
self['model'] = lambda: hub_machine.UTServerMachine(self.ctx)
self['datalayer'] = lambda: datalayer.DataLayer(self.ctx)
def interactive_shell(self):
pass
+5
View File
@@ -0,0 +1,5 @@
class DataLayer:
def __init__(self, ctx):
self.ctx = ctx
+3 -3
View File
@@ -1,4 +1,4 @@
from .config_editor import UnrealIniFile, GameIniSpecial
from .gameconfig_edit import UnrealIniFile, GameIniSpecial
from ._util import md5sum_file
from app_skellington import _util
@@ -412,7 +412,7 @@ ssh {remote_game_host} chown ut4.ut4 {remote_game_dir} -R
project_dir = self.ctx.config['app']['project_dir']
src_dir = '/'.join([project_dir, 'files/rulesets'])
out_dir = '/'.join([project_dir, '/instance/LinuxServer/UnrealTournament/Saved/Rulesets'])
out_dir = '/'.join([project_dir, '/instance/LinuxServer/UnrealTournament/Saved/Config/Rulesets'])
out_filename='/'.join([out_dir, 'ruleset.json'])
cmd = 'mkdir -pv {out_dir}'.format(**{
@@ -423,7 +423,7 @@ ssh {remote_game_host} chown ut4.ut4 {remote_game_dir} -R
self.ctx.log['ut4'].info('out filename=%s', out_filename)
# echo {\"rules\":[ > "$OUT_FILENAME"
cmd = 'echo {{\"rules\":[ > "{out_filename}"'.format(out_filename=out_filename)
cmd = "echo '{{\"rules\":[' > \"{out_filename}\"".format(out_filename=out_filename)
self._invoke_command(cmd)
cmd = 'for f in "{src_dir}"/*.json ; do cat "$f" >> "{out_filename}" ; done'.format(
View File
View File