1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From c0f2c8ea50c5bf5fc7f29a0201186cd6d26ef678 Mon Sep 17 00:00:00 2001
From: Infernio <infernio@icloud.com>
Date: Tue, 28 Mar 2023 13:14:55 +0200
Subject: [PATCH 2/4] Check for missing 'bash' dir instead
Since we'll want the Docs dir to be globally available on Linux. Just
goes to show how much of a WIP our sanity checks on startup are.
---
Mopy/bash/basher/__init__.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Mopy/bash/basher/__init__.py b/Mopy/bash/basher/__init__.py
index 01851a780..051a9b5c5 100644
--- a/Mopy/bash/basher/__init__.py
+++ b/Mopy/bash/basher/__init__.py
@@ -4069,7 +4069,7 @@ def RefreshData(self, evt_active=True, booting=False):
self.warn_corrupted(warn_mods=True, warn_saves=True, warn_strings=True,
warn_bsas=True)
self.warn_game_ini()
- self._missingDocsDir()
+ self._warn_missing_bash_dir()
#--Done (end recursion blocker)
self.inRefreshData = False
return EventResult.FINISH
@@ -4192,15 +4192,15 @@ def warn_game_ini(self):
u'ini': bosh.oblivionIni.abs_path,
u'game': bush.game.displayName}, _(u'Missing game Ini'))
- def _missingDocsDir(self):
- #--Missing docs directory?
- testFile = bass.dirs[u'mopy'].join(u'Docs', u'wtxt_teal.css')
- if self.incompleteInstallError or testFile.exists(): return
+ ##: I'm pretty sure we blow up before we ever get here if the bash dir is
+ # missing, so this should be moved earlier in boot
+ def _warn_missing_bash_dir(self):
+ testFile = bass.dirs['mopy'].join('bash', 'images', 'bash.svg')
+ if self.incompleteInstallError or testFile.is_file(): return
self.incompleteInstallError = True
- msg = _(u'Installation appears incomplete. Please re-unzip bash to '
- u'game directory so that ALL files are installed.') + u'\n\n'\
- + _(u'Correct installation will create a Mopy and %s\\Docs '
- u'directories.') % bush.game.mods_dir
+ msg = (_('Installation appears incomplete. Please reinstall Wrye Bash '
+ 'so that ALL files are installed.') + '\n\n' +
+ _('Correct installation will create a Mopy/bash directory.'))
balt.showWarning(self, msg, _(u'Incomplete Installation'))
def on_closing(self, destroy=True):
--
2.40.0
|