for .src.rpm files properly identify missing utils #869

Also fix latent bug in external_utility_exists() for the secondary case of using 'which' -- need to strip args from supplied exe first.
AlDanial · Nov 18, 2024 · 0fea167 · 0fea167
1 parent fd8d789
commit 0fea167
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Unix/cloc b/Unix/cloc
@@ -13857,7 +13857,7 @@ sub uncompress_archive_cmd {                 # {{{1
                 $missing = "rpm2cpio";
             }
         } else {
-            $missing = "bzip2";
+            $missing = "cpio";
         }
     } elsif ($archive_file =~ /\.(whl|zip)$/i and !$ON_WINDOWS)    {
         if (external_utility_exists("unzip")) {
@@ -13930,13 +13930,17 @@ sub read_list_file {                         # {{{1
 sub external_utility_exists {                # {{{1
     my $exe = shift @_;
 
+    # remove args, if any
+    my $leading_exe = $exe;
+    $leading_exe =~ s/^(\S+)\s*.*?$/$1/;
+
     my $success      = 0;
     if ($ON_WINDOWS) {
         $success = 1 unless system $exe . ' > nul';
     } else {
         $success = 1 unless system $exe . ' >/dev/null 2>&1';
         if (!$success) {
-            $success = 1 unless system "which" . " $exe" . ' >/dev/null 2>&1';
+            $success = 1 unless system "which" . " $leading_exe" . ' >/dev/null 2>&1';
         }
     }
 

diff --git a/cloc b/cloc
@@ -13847,7 +13847,7 @@ sub uncompress_archive_cmd {                 # {{{1
                 $missing = "rpm2cpio";
             }
         } else {
-            $missing = "bzip2";
+            $missing = "cpio";
         }
     } elsif ($archive_file =~ /\.(whl|zip)$/i and !$ON_WINDOWS)    {
         if (external_utility_exists("unzip")) {
@@ -13920,13 +13920,17 @@ sub read_list_file {                         # {{{1
 sub external_utility_exists {                # {{{1
     my $exe = shift @_;
 
+    # remove args, if any
+    my $leading_exe = $exe;
+    $leading_exe =~ s/^(\S+)\s*.*?$/$1/;
+
     my $success      = 0;
     if ($ON_WINDOWS) {
         $success = 1 unless system $exe . ' > nul';
     } else {
         $success = 1 unless system $exe . ' >/dev/null 2>&1';
         if (!$success) {
-            $success = 1 unless system "which" . " $exe" . ' >/dev/null 2>&1';
+            $success = 1 unless system "which" . " $leading_exe" . ' >/dev/null 2>&1';
         }
     }