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

+      }
    } # if
 } # validateLibraries
 # attempt to locate the operating system.
 # if found, will set some defaults for it.
 sub setUpOperatingSystemSpecific {
    my ( $install, $operatingSystems, $os ) = @_;
    print "They passed $os in as the \$os\n" if $verbose > 2;
    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 }} ) {
+      #foreach my $key ( keys %{$$operatingSystems{ $os }} ) {
-         $$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

Subversion Repositories camp_sysinfo_client_3