diff --git a/client/devkit-utils/steamos-get-status b/client/devkit-utils/steamos-get-status index 4516cb6509da6810f97c1085caec913eb7fd7450..49475140f027ce352373403450372da9af5fc7b5 100755 --- a/client/devkit-utils/steamos-get-status +++ b/client/devkit-utils/steamos-get-status @@ -116,10 +116,7 @@ def steam_status(): if s is None: return SteamStatus.NOT_RUNNING if s.find('.local/share/Steam/') != -1: - if os.path.exists( - os.path.expanduser('~/devkit-game/devkit-steam') - ): - # assume this is OS_DEV (with logging) - to be extra sure we could check the stdout/stderr fds.. + if os.path.exists(os.path.expanduser('~/devkit-game/devkit-steam')): return SteamStatus.OS_DEV return SteamStatus.OS if s.find('devkit-game/steam/') != -1: @@ -133,23 +130,17 @@ def steam_status(): def steam_configuration(): '''How is the Steam client configured to run?''' devkit_steam_trampoline_path = os.path.join(DEVKIT_TOOL_FOLDER, 'devkit-steam') - if os.path.exists(devkit_steam_trampoline_path): - t = open(devkit_steam_trampoline_path, 'rt').read() - if t.find('SteamStatus.OS_DEV') != -1: - return SteamConfig.OS_DEV - if t.find('SteamStatus.SIDE') != -1: - return SteamConfig.SIDE - elif t.find('/steam-vscode') != -1: - return SteamConfig.VSCODE - elif t.find('configuration tag') == -1: - # it may be an old trampoline script that didn't write a configuration tag - # in order to avoid strife at the next upgrade after 20220215, assume a side client - logger.warning(f'no \'configuration tag\' line in {devkit_steam_trampoline_path}, assuming old script') - return SteamConfig.SIDE - else: - logger.warning(f'could not determine what {devkit_steam_trampoline_path} means to do') - return SteamConfig.ERROR - return SteamConfig.OS + if not os.path.exists(devkit_steam_trampoline_path): + return SteamConfig.OS + t = open(devkit_steam_trampoline_path, 'rt').read() + if t.find('SteamStatus.OS_DEV') != -1: + return SteamConfig.OS_DEV + if t.find('SteamStatus.SIDE') != -1: + return SteamConfig.SIDE + if t.find('/steam-vscode') != -1: + return SteamConfig.VSCODE + logger.warning(f'could not determine what {devkit_steam_trampoline_path} means to do') + return SteamConfig.ERROR def osclient_branch(): '''Which branch is the default Steam 'OS client' configured to use?''' diff --git a/client/devkit-utils/steamos-set-steam-client b/client/devkit-utils/steamos-set-steam-client index 9f5df9131e4cdaa93ef882b45e22a1882c1818a3..1a1b4497cdf6409937bd5069dc1496c7f8084a93 100644 --- a/client/devkit-utils/steamos-set-steam-client +++ b/client/devkit-utils/steamos-set-steam-client @@ -89,7 +89,7 @@ if __name__ == '__main__': # Generated by steamos-set-steam-client, do not edit! # configuration tag (do not delete): {} mkdir -p $HOME/.steam/steam/logs -exec {} steam &> $HOME/.steam/steam/logs/output.log +exec {} steam '''.format( conf.client, SIDE_LOADED_STEAM_CLIENT @@ -105,7 +105,7 @@ exec {} steam &> $HOME/.steam/steam/logs/output.log # configuration tag (do not delete): {} {} mkdir -p $HOME/.steam/steam/logs -exec {} {} &> $HOME/.steam/steam/logs/output.log +exec {} {} '''.format( conf.client, gdbserver, diff --git a/client/devkit_client/gui2/gui2.py b/client/devkit_client/gui2/gui2.py index 0caa4f0ac54fd0fc437f514b813955b479bc03e2..bbfb547029477cdede7b3547871ffda3af7d8f20 100644 --- a/client/devkit_client/gui2/gui2.py +++ b/client/devkit_client/gui2/gui2.py @@ -278,9 +278,6 @@ class DevkitCommands: sync_logs_args = SyncLogsArgs(devkit, logs_folder) devkit_client.sync_logs(sync_logs_args) - if devkit.steam_client_status == 'SteamStatus.OS': - raise Exception('Some important logs are not be collected, please change the Steam client mode to \'logging+cmdline\' in the Devkit tab') - return True def sync_logs(self, devkit, logs_folder): @@ -1475,7 +1472,7 @@ class DevkitsWindow(ToolWindow): imgui.same_line() config_options = [ ( 'OS client', 'SteamStatus.OS' ), - ( 'OS client dev mode (logging+cmdline)', 'SteamStatus.OS_DEV' ), + ( 'OS client with command line', 'SteamStatus.OS_DEV' ), ] if steamos_status['has_side_loaded_client']: config_options.append( ( 'side loaded client', 'SteamStatus.SIDE' ) ) @@ -2303,7 +2300,7 @@ class DeviceLogs(ToolWindow): self.reload_logs() def reload_logs(self): - steam_log_path = os.path.join(self.logs_folder, 'steam_logs', 'output.log') + steam_log_path = os.path.join(self.logs_folder, 'steam_logs', 'console-linux.txt') if not os.path.exists(steam_log_path): logger.warning('Devkit log does not exist: %r', steam_log_path) return