Merge pull request #551 from cpanel/what_executable

Document what executable is failing
cpanel · Nov 15, 2024 · f938c04 · f938c04
2 parents 7753160 + 1e6060c
commit f938c04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -8435,7 +8435,7 @@ EOS
     sub _ssystem ( $command, %opts ) {
         my @args = @{ $command // [] };
 
-        Carp::croak("Program is not an executable absolute path.") if $args[0] !~ '^/' || !-x $args[0];
+        Carp::croak("Program '$args[0]' is not an executable absolute path.") if $args[0] !~ '^/' || !-x $args[0];
 
         INFO( "Running: " . join( " ", @args ) );
         INFO();    # Buffer so they can more easily read the output.

diff --git a/lib/Elevate/Roles/Run.pm b/lib/Elevate/Roles/Run.pm
@@ -74,7 +74,7 @@ sub _ssystem ( $command, %opts ) {
     my @args = @{ $command // [] };
 
     # Only allow the program to be an executable absolute path
-    Carp::croak("Program is not an executable absolute path.") if $args[0] !~ '^/' || !-x $args[0];
+    Carp::croak("Program '$args[0]' is not an executable absolute path.") if $args[0] !~ '^/' || !-x $args[0];
 
     INFO( "Running: " . join( " ", @args ) );
     INFO();    # Buffer so they can more easily read the output.

diff --git a/t/ssystem.t b/t/ssystem.t
@@ -30,19 +30,19 @@ my $cpev = cpev->new->_init;
 
 like(
     dies { cpev->ssystem('nope') },
-    qr/Program is not an executable absolute path/,
+    qr/Program 'nope' is not an executable absolute path/,
     'Program is not an executable path.'
 );
 
 like(
     dies { cpev->ssystem('grep') },
-    qr/Program is not an executable absolute path/,
+    qr/Program 'grep' is not an executable absolute path/,
     'Program is not an executable absolute path.'
 );
 
 like(
     dies { cpev->ssystem('/etc/apache2/conf/httpd.conf') },
-    qr/Program is not an executable absolute path/,
+    qr{Program '/etc/apache2/conf/httpd.conf' is not an executable absolute path},
     'Paths that are not executable are not allowed.'
 );