Subversion Repositories camp_sysinfo_client_3

Rev

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

Rev 91 Rev 92
Line 28... Line 28...
28 
use YAML::Tiny;
 28 
use YAML::Tiny;
29 
use File::Basename;
 29 
use File::Basename;
30 
use Getopt::Long;
 30 
use Getopt::Long;
31 
Getopt::Long::Configure ("bundling"); # allow -vd --os='debian'
 31 
Getopt::Long::Configure ("bundling"); # allow -vd --os='debian'
32 
 
 32 
 
33 
use Data::Dumper;
 - 
 
34 
 
 - 
 
35 
# $verbose can have the following values
 33 
# $verbose can have the following values
36 
# 0 - do everything
 34 
# 0 - do everything
37 
# 1 - Do everything except the install, display what would be done
 35 
# 1 - Do everything except the install, display what would be done
38 
# 2 - Be verbose to STDERR
 36 
# 2 - Be verbose to STDERR
39 
# 3 - Be very verbose
 37 
# 3 - Be very verbose
Line 417... Line 415...
417 
      } # if preload seed file
 415 
      } # if preload seed file
418 
 
 416 
 
419 
      if (  -f $confFile  ) {
 417 
      if (  -f $confFile  ) {
420 
         push @fileList, $confFile;
 418 
         push @fileList, $confFile;
421 
      }
 419 
      }
422 
      $config = makeConfig( @fileList );
 420 
      $config = &makeConfig( @fileList );
423 
      # if ScriptDirs and moduleDirs not populated, do so from our configuration
 421 
      # if ScriptDirs and moduleDirs not populated, do so from our configuration
424 
      if ( ! $$config{'scriptDirs'} || ! scalar @{ $$config{'scriptDirs'} }  ) {
 422 
      if ( ! $$config{'scriptDirs'} || ! scalar @{ $$config{'scriptDirs'} }  ) {
425 
#         my @temp = ( $$install{'files'}{'scripts'}{'target'} );
 423 
#         my @temp = ( $$install{'files'}{'scripts'}{'target'} );
426 
#         $$config{'scriptDirs'} = \@temp;
 424 
#         $$config{'scriptDirs'} = \@temp;
427 
         $config->{'scriptDirs'} = [ $install->{'files'}->{'scripts'}->{'target'} ];
 425 
         $config->{'scriptDirs'} = [ $install->{'files'}->{'scripts'}->{'target'} ];