diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-12-24 11:38:04 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2020-10-03 11:23:12 +0100 |
| commit | 87d2651edc595bd40a1cf65a7666bbc8247397f9 (patch) | |
| tree | 0b2099336050e70abd70894b8fdde173c9959309 /doc | |
| parent | 2ff1824a87e3aa3b17d88cc58b9b173fc65a4356 (diff) | |
| download | riscv-openocd-87d2651edc595bd40a1cf65a7666bbc8247397f9.zip riscv-openocd-87d2651edc595bd40a1cf65a7666bbc8247397f9.tar.gz riscv-openocd-87d2651edc595bd40a1cf65a7666bbc8247397f9.tar.bz2 | |
Update user dir config file search path
Search in XDG_CONFIG_HOME as per XDG Base Directory Specification
in addition to $HOME/.openocd.
On Darwin, search in ~/Library/Preferences/org.openocd/ which
appears to be one of the conventional locations.
Make $OPENOCD_SCRIPTS highest priority on all platforms, previously
it was only higher on WIN32.
Update the documentation to reflect the search order.
Change-Id: Ibaf4b59b51fdf452712d91b47ea2b5312bb5ada9
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3890
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/openocd.texi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/openocd.texi b/doc/openocd.texi index 3506cca..90b49ee 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -724,8 +724,11 @@ Configuration files and scripts are searched for in @item the current directory, @item any search dir specified on the command line using the @option{-s} option, @item any search dir specified using the @command{add_script_search_dir} command, -@item @file{$HOME/.openocd} (not on Windows), @item a directory in the @env{OPENOCD_SCRIPTS} environment variable (if set), +@item @file{%APPDATA%/OpenOCD} (only on Windows), +@item @file{$HOME/Library/Preferences/org.openocd} (only on Darwin), +@item @file{$XDG_CONFIG_HOME/openocd} (@env{$XDG_CONFIG_HOME} defaults to @file{$HOME/.config}), +@item @file{$HOME/.openocd}, @item the site wide script library @file{$pkgdatadir/site} and @item the OpenOCD-supplied script library @file{$pkgdatadir/scripts}. @end enumerate |