From ecabcab6d1d228e5e8cd77aa2864b5786f8575a9 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 9 Jul 2013 14:37:38 +0200 Subject: [PATCH] corrected setting paths --- soft/toolbox/jtag_atomic/libs/Config/Abstract.pm | 1 - soft/toolbox/jtag_atomic/ui.pl | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm b/soft/toolbox/jtag_atomic/libs/Config/Abstract.pm index 12cab05..cbe19a9 100644 --- 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 2fcedc7..d7c91b1 100755 --- 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) { -- 2.43.0