helper/options: Use OPENOCD_SCRIPTS dir if set.

This makes it easier to relocate the install tree of OpenOCD from where
it was originally built (for example, if put onto a different machine),
without having to change scripts or add something to the command line
every time.

Change-Id: Ia5edf0eba166f7a999f267bd6a92402dab9b399e
Signed-off-by: Jonathan Larmour <jifl@eCosCentric.com>
Reviewed-on: http://openocd.zylin.com/3004
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 0608a28d231060c8b04dc45c8b7361cb6d4bf8cd..1248727d3895f27f3bf2273735ea518e79dece6e 100644 (file)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -700,6 +700,7 @@ Configuration files and scripts are searched for in
 @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 the site wide script library @file{$pkgdatadir/site} and
 @item the OpenOCD-supplied script library @file{$pkgdatadir/scripts}.
 @end enumerate

diff --git a/src/helper/options.c b/src/helper/options.c
index bbd071fd8191c96c1e88e09718b6c8fd7763ac85..b13d466d3cb8992ecdbf12d471203b48a1390713 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -113,6 +113,12 @@ static void add_default_dirs(void)
                        free(path);
                }
        }
+
+       path = getenv("OPENOCD_SCRIPTS");
+
+       if (path)
+               add_script_search_dir(path);
+
 #ifdef _WIN32
        const char *appdata = getenv("APPDATA");