qutebrowser: choose correct executable when restarting (#55739)
fixes #25832
This commit is contained in:
parent
7498aff7d8
commit
50a17aa46f
@ -53,7 +53,13 @@ in python3Packages.buildPythonApplication rec {
|
|||||||
pyreadability pykeepass stem
|
pyreadability pykeepass stem
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./fix-restart.patch
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
|
||||||
|
|
||||||
sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py
|
sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py
|
||||||
'' + lib.optionalString withPdfReader ''
|
'' + lib.optionalString withPdfReader ''
|
||||||
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
|
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
|
||||||
|
index 2b6896b76..ee05f379d 100644
|
||||||
|
--- a/qutebrowser/app.py
|
||||||
|
+++ b/qutebrowser/app.py
|
||||||
|
@@ -555,22 +555,8 @@ class Quitter:
|
||||||
|
args: The commandline as a list of strings.
|
||||||
|
cwd: The current working directory as a string.
|
||||||
|
"""
|
||||||
|
- if os.path.basename(sys.argv[0]) == 'qutebrowser':
|
||||||
|
- # Launched via launcher script
|
||||||
|
- args = [sys.argv[0]]
|
||||||
|
- cwd = None
|
||||||
|
- elif hasattr(sys, 'frozen'):
|
||||||
|
- args = [sys.executable]
|
||||||
|
- cwd = os.path.abspath(os.path.dirname(sys.executable))
|
||||||
|
- else:
|
||||||
|
- args = [sys.executable, '-m', 'qutebrowser']
|
||||||
|
- cwd = os.path.join(
|
||||||
|
- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..')
|
||||||
|
- if not os.path.isdir(cwd):
|
||||||
|
- # Probably running from a python egg. Let's fallback to
|
||||||
|
- # cwd=None and see if that works out.
|
||||||
|
- # See https://github.com/qutebrowser/qutebrowser/issues/323
|
||||||
|
- cwd = None
|
||||||
|
+ args = ['@qutebrowser@']
|
||||||
|
+ cwd = None
|
||||||
|
|
||||||
|
# Add all open pages so they get reopened.
|
||||||
|
page_args = []
|
Loading…
Reference in New Issue
Block a user