diff options
| author | toofar <toofar@spalge.com> | 2023-07-18 20:54:21 +1200 |
|---|---|---|
| committer | toofar <toofar@spalge.com> | 2023-07-27 19:17:27 +1200 |
| commit | c0d31d399d31d3c45f47e375826ed87c16807edf (patch) | |
| tree | 536caabc50245544b115064a626d7d3590e84bfc | |
| parent | f254680641fe06f9f6c94f4020aacba51fbf545a (diff) | |
| download | qutebrowser-c0d31d399d31d3c45f47e375826ed87c16807edf.tar.gz qutebrowser-c0d31d399d31d3c45f47e375826ed87c16807edf.zip | |
adjust pyinstaller data paths to match importlib_resources
Not that we are looking up resources via importlib_resources for
pyinstaller builds too we need to change where the data files are
installed to to match what importlib_resources is expecting.
There was a comment in the previous resource lookup special case
complaining about the data files being at the top level so it seems this
is a change for the better anyhow.
Observed paths:
requested file: qutebrowser.app/Contents/Frameworks/qutebrowser/config/configdata.yml
actual file : qutebrowser.app/Contents/Frameworks/config/configdata.yml
| -rw-r--r-- | misc/qutebrowser.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec index 1eee9161d..120d05138 100644 --- a/misc/qutebrowser.spec +++ b/misc/qutebrowser.spec @@ -64,17 +64,17 @@ INFO_PLIST_UPDATES = { def get_data_files(): data_files = [ - ('../qutebrowser/html', 'html'), - ('../qutebrowser/img', 'img'), - ('../qutebrowser/icons', 'icons'), - ('../qutebrowser/javascript', 'javascript'), - ('../qutebrowser/html/doc', 'html/doc'), - ('../qutebrowser/git-commit-id', '.'), - ('../qutebrowser/config/configdata.yml', 'config'), + ('../qutebrowser/html', 'qutebrowser/html'), + ('../qutebrowser/img', 'qutebrowser/img'), + ('../qutebrowser/icons', 'qutebrowser/icons'), + ('../qutebrowser/javascript', 'qutebrowser/javascript'), + ('../qutebrowser/html/doc', 'qutebrowser/html/doc'), + ('../qutebrowser/git-commit-id', 'qutebrowser/git-commit-id'), + ('../qutebrowser/config/configdata.yml', 'qutebrowser/config'), ] if os.path.exists(os.path.join('qutebrowser', '3rdparty', 'pdfjs')): - data_files.append(('../qutebrowser/3rdparty/pdfjs', '3rdparty/pdfjs')) + data_files.append(('../qutebrowser/3rdparty/pdfjs', 'qutebrowser/3rdparty/pdfjs')) else: print("Warning: excluding pdfjs as it's not present!") |