corrected setting paths

diff --git a/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm b/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm
index 12cab05b37624b21576be7fe02ca7951b439064e..cbe19a9a4809532d864b84c626d3687f700e8b49 100644 (file)
--- a/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm
+++ b/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm
@@ -264,7 +264,6 @@ 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 2fcedc7b77b65dbbc007683acb52246ff7fdb2c8..d7c91b149e7def679bf2d8d393e78b2901607a14 100755 (executable)
--- a/soft/toolbox/jtag_atomic/ui.pl
+++ b/soft/toolbox/jtag_atomic/ui.pl
@@ -167,9 +167,8 @@ sub execute_shell_command_return {
         return $result;
 }
 
-
 my $boardsfile= 'boards.ini';
-$boardsfile = $ENV{'JTAGCONFIGPATH'}."/".$boardsfile if exists($ENV{'JTAGCONFIGPATH'});
+$boardsfile = $ENV{'JTAGCONFIGPATH'}."/".$boardsfile if defined($ENV{'JTAGCONFIGPATH'});
 my $boardsSettings = new Config::Abstract::Ini($boardsfile);  
 my %allboards = $boardsSettings->get_all_settings;
 foreach my $board (keys %allboards) {