From 1e97a4d791c74709cfb1bd3297c2e1bc1f5eeaf5 Mon Sep 17 00:00:00 2001 From: derrod Date: Mon, 23 May 2022 07:45:14 +0200 Subject: [PATCH] [cli/core] Only check CX_BOTTLE when using CrossOver wine Addresses issues pointed out in #414 --- legendary/cli.py | 8 ++++++-- legendary/core.py | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/legendary/cli.py b/legendary/cli.py index 9180e89..f356064 100644 --- a/legendary/cli.py +++ b/legendary/cli.py @@ -647,7 +647,7 @@ class LegendaryCLI: full_env = os.environ.copy() full_env.update(params.environment) - if 'CX_BOTTLE' in full_env: + if 'CX_BOTTLE' in full_env and any('SharedSupport/CrossOver' in p for p in params.launch_command): # if using crossover, unset WINEPREFIX full_env.pop('WINEPREFIX', None) # check that bottle is valid, show error otherwise @@ -659,6 +659,8 @@ class LegendaryCLI: else: logger.error(f'Specified CrossOver bottle {bottle_name} does not exist, cannot launch.') exit(1) + else: + logger.info(f'Using CrossOver Bottle "{bottle_name}"') if args.dry_run: logger.info(f'Not Launching {app_name} (dry run)') @@ -744,7 +746,7 @@ class LegendaryCLI: full_env = os.environ.copy() full_env.update(env) - if 'CX_BOTTLE' in full_env: + if 'CX_BOTTLE' in full_env and any('SharedSupport/CrossOver' in p for p in command): # if using crossover, unset WINEPREFIX full_env.pop('WINEPREFIX', None) # check that bottle is valid, show error otherwise @@ -756,6 +758,8 @@ class LegendaryCLI: else: logger.error(f'Specified CrossOver bottle {bottle_name} does not exist, cannot launch.') exit(1) + else: + logger.info(f'Using CrossOver Bottle "{bottle_name}"') if not command: logger.error(f'In order to launch Origin correctly you must specify a prefix and wine binary or ' diff --git a/legendary/core.py b/legendary/core.py index e7b2c57..05c1829 100644 --- a/legendary/core.py +++ b/legendary/core.py @@ -597,7 +597,9 @@ class LegendaryCore: env['CX_BOTTLE'] = cx_bottle else: cx_bottle = os.environ['CX_BOTTLE'] - self.log.info(f'Using CrossOver Bottle "{cx_bottle}"') + + if cx_bottle: + self.log.debug(f'Using CrossOver Bottle "{cx_bottle}"') if wine_pfx: env['WINEPREFIX'] = wine_pfx