From 6a480564cbe8675be0f9dce069e4a515829b0f57 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 11 Sep 2018 19:44:37 +0200 Subject: [PATCH] Fix docs to say XDG_DATA_HOME instead of _DIR --- doc/changelog.asciidoc | 2 +- doc/help/commands.asciidoc | 4 ++-- qutebrowser/browser/commands.py | 2 +- qutebrowser/browser/hints.py | 2 +- qutebrowser/commands/userscripts.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 04fbbafd4..4c11e91cf 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -1631,7 +1631,7 @@ Changed `tabs.bg/fg.selected.odd/even`. - `:spawn --userscript` and `:hint` with the `userscript` target now look up relative paths in `~/.local/share/qutebrowser/userscripts` or - `$XDG_DATA_DIR`. Using a binary in `$PATH` won't work anymore with + `$XDG_DATA_HOME`. Using a binary in `$PATH` won't work anymore with `--userscript`. - New design for error pages - Link filtering for hints now checks if the text is contained anywhere in diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc index 4b4ad54bc..a4a65315c 100644 --- a/doc/help/commands.asciidoc +++ b/doc/help/commands.asciidoc @@ -576,7 +576,7 @@ Start hinting. - With `userscript`: The userscript to execute. Either store the userscript in `~/.local/share/qutebrowser/userscripts` - (or `$XDG_DATA_DIR`), or use an absolute + (or `$XDG_DATA_HOME`), or use an absolute path. - With `fill`: The command to fill the statusbar with. `{hint-url}` will get replaced by the selected @@ -1193,7 +1193,7 @@ Spawn a command in a shell. * +*-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`) + (or `$XDG_DATA_HOME`) - `/usr/share/qutebrowser/userscripts` * +*-v*+, +*--verbose*+: Show notifications when the command started/exited. diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index d5e1797ac..441e88dbc 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1183,7 +1183,7 @@ class CommandDispatcher: absolute path, or store the userscript in one of those locations: - `~/.local/share/qutebrowser/userscripts` - (or `$XDG_DATA_DIR`) + (or `$XDG_DATA_HOME`) - `/usr/share/qutebrowser/userscripts` verbose: Show notifications when the command started/exited. output: Whether the output should be shown in a new tab. diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index 6e5f4d7f4..00481c2f4 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -693,7 +693,7 @@ class HintManager(QObject): - With `userscript`: The userscript to execute. Either store the userscript in `~/.local/share/qutebrowser/userscripts` - (or `$XDG_DATA_DIR`), or use an absolute + (or `$XDG_DATA_HOME`), or use an absolute path. - With `fill`: The command to fill the statusbar with. `{hint-url}` will get replaced by the selected diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py index 5654fd809..8d95db07d 100644 --- a/qutebrowser/commands/userscripts.py +++ b/qutebrowser/commands/userscripts.py @@ -432,7 +432,7 @@ def run_async(tab, cmd, *args, win_id, env, verbose=False): cmd_path = os.path.expanduser(cmd) # if cmd is not given as an absolute path, look it up - # ~/.local/share/qutebrowser/userscripts (or $XDG_DATA_DIR) + # ~/.local/share/qutebrowser/userscripts (or $XDG_DATA_HOME) if not os.path.isabs(cmd_path): log.misc.debug("{} is no absolute path".format(cmd_path)) cmd_path = _lookup_path(cmd)