Subversion Repositories camp_sysinfo_client_3

Rev

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

Rev 253 Rev 256
Line 20... Line 20...
20 
 
 20 
 
21 
# Description: Library used by modules. Do NOT enable
 21 
# Description: Library used by modules. Do NOT enable
22 
 
 22 
 
23 
our $VERSION = '1.4.3';
 23 
our $VERSION = '1.4.3';
24 
 
 24 
 
- 
 
 25 
#use Exporter 'import';
- 
 
 26 
#our @ISA = qw( Exporter );
- 
 
 27 
#our @EXPORT_OK = qw ( checkOS );
- 
 
 28 
#our %EXPORT_TAGS = (
- 
 
 29 
#   default => [ qw(checkOS ) ]
- 
 
 30 
#   );
- 
 
 31 
 
25 
# set of libraries to be used by these modules
 32 
# set of libraries to be used by these modules
26 
 
 33 
 
27 
# parameters
 34 
# parameters
28 
# $report - a reference to a report array (one line per row)
35 
# $report - a reference to a report array (one line per row)
29 
# $headerRegex - optional regex to locate the first (header) line.
 36 
# $headerRegex - optional regex to locate the first (header) line.
Line 114... Line 121...
114 
}
 121 
}
115 
 
 122 
 
116 
# checks if a command is valid on this system. If so, returns the full path to it
 123 
# checks if a command is valid on this system. If so, returns the full path to it
117 
# else, returns empty string. Theoretically valid for Unix and Windows systems (tested Win10, Server 2019)
 124 
# else, returns empty string. Theoretically valid for Unix and Windows systems (tested Win10, Server 2019)
118 
sub validCommandOnSystem {
 125 
sub validCommandOnSystem {
119 
   my $command = shift;
 126 
   my $commandList = shift;
- 
 
 127 
   my $ok = 1;
- 
 
 128 
   foreach my $command (keys %$commandList ) {
120 
   # Windows uses 'where' while Unix uses which. Tested only on Windows Server
 129 
      # Windows uses 'where' while Unix uses which. Tested only on Windows Server
121 
   $command = lc $^O eq 'mswin32' ? `where $command 2> nul` : `which $command 2> /dev/null`;
 130 
      $commandList->{$command} = lc $^O eq 'mswin32' ? `where $command 2> nul` : `which $command 2> /dev/null`;
- 
 
 131 
      chomp $commandList->{$command};
- 
 
 132 
      $ok = 0 unless $commandList->{$command};
- 
 
 133 
   }
- 
 
 134 
   return $ok;
122 
   chomp $command;
 135 
   #chomp $command;
123 
   return -x $command ? $command : '';
 136 
   #return -x $command ? $command : '';
124 
}
 137 
}
125 
 
 138 
 
126 
# when passed a hashref containing the lower case of operating systems
 139 
# when passed a hashref containing the lower case of operating systems
127 
# which can be used as keys, will return true if the operating system
 140 
# which can be used as keys, will return true if the operating system
128 
# we are on is there.
 141 
# we are on is there.