proper path usage & closing files

diff --git a/tools/startup.pl b/tools/startup.pl
index 7c6e98c63cd7d3558d50ed27491c6fa2ca15d8f4..50442d55551cf505adcfbcb1e7f456bb11e5ad95 100755 (executable)
--- a/tools/startup.pl
+++ b/tools/startup.pl
@@ -33,16 +33,21 @@ die "DAQOPSERVER not set in environment. Points to trbnetd that provides access
 die "JTAGPATH not set in environment. Points to JTAG tools (e.g. ui.pl).\n" unless (defined $ENV{'JTAGPATH'});
 
 unless (defined $ENV{'JTAGCONFIGPATH'}) {
-  printf "JTAGCONFIGPATH not set in environment. Points to JTAG config files (e.g. chains.ini). Using default.\n" if $verbose;
+  printf "JTAGCONFIGPATH not set in environment. Points to JTAG config files (e.g. chains.ini). Using default $defaultIniPath\n" if $verbose;
   $ENV{'JTAGCONFIGPATH'} = $defaultIniPath;
-  mkdir($defaultIniPath) unless (-e $defaultIniPath);
   }
 
 unless (defined $ENV{'XMLPATH'}) {
-  printf "XMLPATH not set in environment. Points to XML file directory. Using default.\n" if $verbose;
+  printf "XMLPATH not set in environment. Points to XML file directory. Using default $defaultXmlPath\n" if $verbose;
   $ENV{'XMLPATH'} = $defaultXmlPath;
   }  
   
+  
+$defaultIniPath = $ENV{'JTAGCONFIGPATH'};
+$defaultXmlPath = $ENV{'XMLPATH'};
+mkdir($defaultIniPath) unless (-e $defaultIniPath);
+
+  
 ###############################
 ## Read setup xml file
 ###############################  

diff --git a/tools/xml2ini.pl b/tools/xml2ini.pl
index 9ec385427fb37d9f106a78480e8f58bda5024f19..cf0188b79e453fa2a5810a01888b0e2e1c0326cc 100755 (executable)
--- a/tools/xml2ini.pl
+++ b/tools/xml2ini.pl
@@ -234,7 +234,7 @@ for my $specRegister ( @specRegisters){
 
 
 
-
+close OUTPUT;