mirror of
https://github.com/derrod/legendary.git
synced 2024-12-22 01:45:28 +00:00
[cli] Fix and cleanup uninstaller wording/handling
Somebody made a little copy-paste mistake there...
This commit is contained in:
parent
6536473063
commit
865dd51e2b
|
@ -1175,17 +1175,10 @@ class LegendaryCLI:
|
||||||
def _handle_uninstaller(self, igame, yes=False):
|
def _handle_uninstaller(self, igame, yes=False):
|
||||||
uninstaller = igame.uninstaller
|
uninstaller = igame.uninstaller
|
||||||
|
|
||||||
print('\nThis game lists the following prerequisites to be installed:')
|
print('\nThis game provides the following uninstaller:')
|
||||||
print(f'- {" ".join((uninstaller["path"], uninstaller["args"]))}\n')
|
print(f'- {uninstaller["path"]} {uninstaller["args"]}\n')
|
||||||
|
|
||||||
# default to yes
|
if yes or get_boolean_choice('Do you wish to run the uninstaller?', default=True):
|
||||||
c = 'y'
|
|
||||||
if not yes:
|
|
||||||
choice = input('Do you wish to run the uninstaller? ([y]es, [n]o): ')
|
|
||||||
if choice:
|
|
||||||
c = choice.lower()[0]
|
|
||||||
|
|
||||||
if c == 'y': # set to installed and launch installation
|
|
||||||
logger.info('Running uninstaller...')
|
logger.info('Running uninstaller...')
|
||||||
req_path, req_exec = os.path.split(uninstaller['path'])
|
req_path, req_exec = os.path.split(uninstaller['path'])
|
||||||
work_dir = os.path.join(igame.install_path, req_path)
|
work_dir = os.path.join(igame.install_path, req_path)
|
||||||
|
@ -1195,8 +1188,6 @@ class LegendaryCLI:
|
||||||
p.wait()
|
p.wait()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f'Failed to run uninstaller: {e!r}')
|
logger.error(f'Failed to run uninstaller: {e!r}')
|
||||||
elif c != 'n':
|
|
||||||
print('Invalid choice, not running uninstaller...')
|
|
||||||
|
|
||||||
def verify_game(self, args, print_command=True, repair_mode=False, repair_online=False):
|
def verify_game(self, args, print_command=True, repair_mode=False, repair_online=False):
|
||||||
args.app_name = self._resolve_aliases(args.app_name)
|
args.app_name = self._resolve_aliases(args.app_name)
|
||||||
|
|
Loading…
Reference in a new issue