added possibility to set config path by $JTAGCONFIGPATH

diff --git a/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm b/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm
index cbe19a9a4809532d864b84c626d3687f700e8b49..12cab05b37624b21576be7fe02ca7951b439064e 100644 (file)
--- a/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm
+++ b/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm
@@ -264,6 +264,7 @@ sub _read_settings{
                @conflines = @{$settingdata};
        }else{
                my $settingsfile = $settingdata;
+               $settingsfile = $ENV{'JTAGCONFIGPATH'}."/".$settingsfile if exists $ENV{'JTAGCONFIGPATH'};
                # Read in the ini file we want to use
                # Probably not a good idea to die on error at this
                # point, but that's what we've got for the moment

diff --git a/soft/toolbox/jtag_atomic/ui.pl b/soft/toolbox/jtag_atomic/ui.pl
index 9f8ac91ea20ff5bcab5fb0c94566dd7c7bf928e7..2fcedc7b77b65dbbc007683acb52246ff7fdb2c8 100755 (executable)
--- a/soft/toolbox/jtag_atomic/ui.pl
+++ b/soft/toolbox/jtag_atomic/ui.pl
@@ -169,6 +169,7 @@ sub execute_shell_command_return {
 
 
 my $boardsfile= 'boards.ini';
+$boardsfile = $ENV{'JTAGCONFIGPATH'}."/".$boardsfile if exists($ENV{'JTAGCONFIGPATH'});
 my $boardsSettings = new Config::Abstract::Ini($boardsfile);  
 my %allboards = $boardsSettings->get_all_settings;
 foreach my $board (keys %allboards) {
@@ -226,7 +227,7 @@ foreach my $board (keys %allboards) {
     exit(0);
   }
     
-    
+$chainsini = $ENV{'JTAGCONFIGPATH'}."/".$chainsini if exists($ENV{'JTAGCONFIGPATH'});    
   my $chainsSettings = new Config::Abstract::Ini($chainsini);
   my %allchains = $chainsSettings->get_all_settings;
   if(!defined($allchains{$opt_chain})) { die ("Chain $opt_chain not found.");}