- Add ssacli as an alias to hpssacli in new naming scheme

- Rewrite check of executable to not hardcode each combination
lausser · Jan 18, 2017 · 779403e · 779403e
1 parent bc4173a
commit 779403e
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/plugins-scripts/HP/Proliant.pm b/plugins-scripts/HP/Proliant.pm
@@ -341,19 +341,16 @@ EOEO
           if ($self->{runtime}->{options}->{hpacucli}) {
             #1 oder 0. pfad selber finden
             my $hpacucli = undef;
-            if (-e '/usr/sbin/hpssacli') {
-              $hpacucli = '/usr/sbin/hpssacli';
-            } elsif (-e '/usr/local/sbin/hpssacli') {
-              $hpacucli = '/usr/local/sbin/hpssacli';
-            } elsif (-e '/usr/sbin/hpacucli') {
-              $hpacucli = '/usr/sbin/hpacucli';
-            } elsif (-e '/usr/local/sbin/hpacucli') {
-              $hpacucli = '/usr/local/sbin/hpacucli';
-            } elsif (-e '/usr/sbin/hpssacli') {
-              $hpacucli = '/usr/sbin/hpssacli';
-            } elsif (-e '/usr/local/sbin/hpssacli') {
-              $hpacucli = '/usr/local/sbin/hpssacli';
-            } else {
+            CLIEXECTEST:
+            foreach my $cliexec (qw(ssacli hpssacli hpacucli)) {
+              foreach my $clipaths (qw(/usr/sbin/ /usr/local/sbin/ /sbin/)) {
+                if (-e $clipaths . $cliexec) {
+                  $hpacucli = $clipaths . $cliexec;
+                  last CLIEXECTEST;
+                }
+              }
+            }
+            if (! defined $hpacucli) {
               $hpacucli = $hpasmcli;
               $hpacucli =~ s/^sudo\s*//;
               $hpacucli =~ s/hpasmcli/hpacucli/;