From 804468f7b913ce64563b3c486666fa0d443aa003 Mon Sep 17 00:00:00 2001
From: DubbleClick <m@pyc.ac>
Date: Thu, 19 Jun 2025 09:14:39 +0700
Subject: [PATCH] refactor common exec code out

---
 src/SPC/util/UnixShell.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/SPC/util/UnixShell.php b/src/SPC/util/UnixShell.php
index 0f320d50..bb4e8d5e 100644
--- a/src/SPC/util/UnixShell.php
+++ b/src/SPC/util/UnixShell.php
@@ -44,14 +44,7 @@ class UnixShell
     {
         /* @phpstan-ignore-next-line */
         logger()->info(ConsoleColor::yellow('[EXEC] ') . ConsoleColor::green($cmd));
-        logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']);
-        $env_str = $this->getEnvString();
-        if (!empty($env_str)) {
-            $cmd = "{$env_str} {$cmd}";
-        }
-        if ($this->cd !== null) {
-            $cmd = 'cd ' . escapeshellarg($this->cd) . ' && ' . $cmd;
-        }
+        $cmd = $this->getExecString($cmd);
         if (!$this->debug) {
             $cmd .= ' 1>/dev/null 2>&1';
         }
@@ -99,10 +92,7 @@ class UnixShell
             /* @phpstan-ignore-next-line */
             logger()->debug(ConsoleColor::blue('[EXEC] ') . ConsoleColor::gray($cmd));
         }
-        logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']);
-        if ($this->cd !== null) {
-            $cmd = 'cd ' . escapeshellarg($this->cd) . ' && ' . $cmd;
-        }
+        $cmd = $this->getExecString($cmd);
         exec($cmd, $out, $code);
         return [$code, $out];
     }
@@ -126,4 +116,21 @@ class UnixShell
         }
         return trim($str);
     }
+
+    /**
+     * @param string $cmd
+     * @return string
+     */
+    private function getExecString(string $cmd): string
+    {
+        logger()->debug('Executed at: ' . debug_backtrace()[0]['file'] . ':' . debug_backtrace()[0]['line']);
+        $env_str = $this->getEnvString();
+        if (!empty($env_str)) {
+            $cmd = "{$env_str} {$cmd}";
+        }
+        if ($this->cd !== null) {
+            $cmd = 'cd ' . escapeshellarg($this->cd) . ' && ' . $cmd;
+        }
+        return $cmd;
+    }
 }