WebSVN – camp_sysinfo_client_3 – Diff – /trunk/install-sysinfo-client.pl

    if ( $os ) {
       # We found the OS, set up some defaults
       $$install{'os'} = $os;
       print "Setting keys for operating system\n" if $verbose > 2;
       # merge operatingSystems into install
-      $install = deepmerge( $install, $operatingSystems->{ $os } );
+      foreach my $key ( keys %{$operatingSystems->{ $os }} ) {
+         if ( $key eq 'files' ) {
-      #foreach my $key ( keys %{$$operatingSystems{ $os }} ) {
+            $install->{'files'} = { %{$install->{'files'}}, %{$operatingSystems->{$os}->{'files'}} }
+         } else {
-      #   $$install{$key} = $operatingSystems{ $os }{$key};
+            $install->{$key} = $operatingSystems->{ $os }->{$key};
+         }
-      #} # if it is a known OS
+      } # if it is a known OS
    } # if
    return $os;
 } # getOperatingSystem
 if ( $version ) { print "$0 version $VERSION\n"; exit; }
 &setDryRun( $dryRun ); # tell the library whether this is a dry run or not
 $os = `$sourceDir/determineOS` unless $os;
 # figure out if we know our operating system and set up special stuff for it
 $os = &setUpOperatingSystemSpecific( \%install, \%operatingSystems, $os );
+#$os = &setUpOperatingSystemSpecific( \%install, \%operatingSystems, 'freebsd' );
+#print Dumper( \%install ); die;
 &validateLibraries( \%libraries, $os );
 $installType = &getInstallActions( \%install );
 # based on the defaults, flesh out the install hash

Subversion Repositories camp_sysinfo_client_3