From 62d619b6cd74f610b0c95fce50e0730d9df9cf4c Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 30 Mar 2025 22:05:20 +0800 Subject: [PATCH] Fix redundant pre-built name calling --- src/SPC/builder/linux/SystemUtil.php | 2 +- src/SPC/store/Downloader.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SPC/builder/linux/SystemUtil.php b/src/SPC/builder/linux/SystemUtil.php index 8b115663..e49830d2 100644 --- a/src/SPC/builder/linux/SystemUtil.php +++ b/src/SPC/builder/linux/SystemUtil.php @@ -211,7 +211,7 @@ class SystemUtil // Match Version * line // match ldd version: "Version 1.2.3" match 1.2.3 $pattern = '/Version\s+(\d+\.\d+\.\d+)/'; - if (preg_match($pattern, $result[1][1], $matches)) { + if (preg_match($pattern, $result[1][1] ?? '', $matches)) { return $matches[1]; } } diff --git a/src/SPC/store/Downloader.php b/src/SPC/store/Downloader.php index 984cada8..605cd556 100644 --- a/src/SPC/store/Downloader.php +++ b/src/SPC/store/Downloader.php @@ -654,8 +654,8 @@ class Downloader } } // If lock file exists for current arch and glibc target, skip downloading - $lock_name = self::getPreBuiltLockName($name); - if (!$force && $download_as === SPC_DOWN_PRE_BUILT && isset($lock[$lock_name])) { + + if (!$force && $download_as === SPC_DOWN_PRE_BUILT && isset($lock[$lock_name = self::getPreBuiltLockName($name)])) { // lock name with env if ( $lock[$lock_name]['source_type'] === 'archive' && file_exists(DOWNLOAD_PATH . '/' . $lock[$lock_name]['filename']) ||