From f2f0f429fbf0b284fddf84b394bf5b3c175130ba Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 25 Mar 2016 11:09:03 +0100 Subject: [PATCH] Update docs --- CHANGELOG.asciidoc | 1 + README.asciidoc | 1 + doc/help/commands.asciidoc | 7 +++++-- qutebrowser/browser/commands.py | 9 ++++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index eb3f2bbdf..b42ec2279 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -43,6 +43,7 @@ Changed `:download-cancel --all`. It does the same as `:download-clear`. - Improved detection of URLs/search terms when pasting multiple lines. - Don't remove `qutebrowser-editor-*` temporary file if editor subprocess crashed +- Userscripts are also searched in `/usr/share/qutebrowser/userscripts`. Fixed ~~~~~ diff --git a/README.asciidoc b/README.asciidoc index 8d534b252..181bd11aa 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -199,6 +199,7 @@ Contributors, sorted by the number of commits in descending order: * Fritz V155 Reichwald * Franz Fellner * Corentin Jule +* Clayton Craft * zwarag * xd1le * haxwithaxe diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc index 0d6fa8169..79e0549dd 100644 --- a/doc/help/commands.asciidoc +++ b/doc/help/commands.asciidoc @@ -625,8 +625,11 @@ Note the {url} variable which gets replaced by the current URL might be useful h * +'cmdline'+: The commandline to execute. ==== optional arguments -* +*-u*+, +*--userscript*+: Run the command as a userscript. Either store the userscript in `~/.local/share/qutebrowser/userscripts` - (or `$XDG_DATA_DIR`), or use an absolute path. +* +*-u*+, +*--userscript*+: Run the command as a userscript. You can use an absolute path, or store the userscript in one of those + locations: + - `~/.local/share/qutebrowser/userscripts` + (or `$XDG_DATA_DIR`) + - `/usr/share/qutebrowser/userscripts` * +*-v*+, +*--verbose*+: Show notifications when the command started/exited. * +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser. diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index c34c766a2..82a52cc3f 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -918,9 +918,12 @@ class CommandDispatcher: useful here. Args: - userscript: Run the command as a userscript. Either store the - userscript in `~/.local/share/qutebrowser/userscripts` - (or `$XDG_DATA_DIR`), or use an absolute path. + userscript: Run the command as a userscript. You can use an + absolute path, or store the userscript in one of those + locations: + - `~/.local/share/qutebrowser/userscripts` + (or `$XDG_DATA_DIR`) + - `/usr/share/qutebrowser/userscripts` verbose: Show notifications when the command started/exited. detach: Whether the command should be detached from qutebrowser. cmdline: The commandline to execute.