Subversion Repositories camp_sysinfo_client_3

Rev

Rev 50 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 50 Rev 54
Line 412... Line 412...
412
 
412
 
413
      if (  -f $confFile  ) {
413
      if (  -f $confFile  ) {
414
         push @fileList, $confFile;
414
         push @fileList, $confFile;
415
      }
415
      }
416
      $config = makeConfig( @fileList );
416
      $config = makeConfig( @fileList );
-
 
417
      # if ScriptDirs and moduleDirs not populated, do so from our configuration
-
 
418
      if ( ! scalar @{ $$config{'scriptDirs'} }  ) {
-
 
419
         $$config{'scriptDirs'} = [ ( $$install{'files'}{'scripts'}{'target'} ) ];
-
 
420
      }
-
 
421
      if ( ! @{ $$config{'moduleDirs'} }  ) {
-
 
422
         $$config{'moduleDirs'} = [ ( $$install{'files'}{'modules'}{'target'}  ) ];
-
 
423
      }
-
 
424
#      print Dumper ($config ) ; die;
417
      my $content = &showConf( $config );
425
      my $content = &showConf( $config );
418
      print $content;
426
      print $content;
419
      print &writeConfig( $$install{'configuration'}{'configuration file'} , $content ) . "\n"
427
      print &writeConfig( $$install{'configuration'}{'configuration file'} , $content ) . "\n"
420
         if ( &yesno( "Write the above configuration to $$install{'configuration'}{'configuration file'}?" ) );
428
         if ( &yesno( "Write the above configuration to $$install{'configuration'}{'configuration file'}?" ) );
421
   } # if we are building/merging configuration
429
   } # if we are building/merging configuration