diff --git a/src/SPC/builder/LibraryBase.php b/src/SPC/builder/LibraryBase.php index cffee91f..939ca11e 100644 --- a/src/SPC/builder/LibraryBase.php +++ b/src/SPC/builder/LibraryBase.php @@ -45,7 +45,7 @@ abstract class LibraryBase $lock = json_decode(FileSystem::readFile(DOWNLOAD_PATH . '/.lock.json'), true) ?? []; $source = Config::getLib(static::NAME, 'source'); // if source is locked as pre-built, we just tryInstall it - if (isset($lock[$source]) && $lock[$source]['lock_as'] === SPC_LOCK_PRE_BUILT) { + if (isset($lock[$source]) && ($lock[$source]['lock_as'] ?? SPC_LOCK_SOURCE) === SPC_LOCK_PRE_BUILT) { return $this->tryInstall($lock[$source]['filename'], $force); } return $this->tryBuild($force); diff --git a/src/SPC/command/BuildCliCommand.php b/src/SPC/command/BuildCliCommand.php index 492059ec..2356e96f 100644 --- a/src/SPC/command/BuildCliCommand.php +++ b/src/SPC/command/BuildCliCommand.php @@ -147,7 +147,7 @@ class BuildCliCommand extends BuildCommand $builder->proveExts($extensions); // validate libs and exts $builder->validateLibsAndExts(); - // build libraries + // build or install libraries $builder->setupLibs(); if ($this->input->getOption('with-clean')) { diff --git a/src/SPC/command/dev/PackLibCommand.php b/src/SPC/command/dev/PackLibCommand.php index 8cb9014a..f97eaabd 100644 --- a/src/SPC/command/dev/PackLibCommand.php +++ b/src/SPC/command/dev/PackLibCommand.php @@ -64,7 +64,7 @@ class PackLibCommand extends BuildCommand FileSystem::writeFile(WORKING_DIR . '/packlib_files.txt', implode("\n", $increase_files)); // pack $filename = WORKING_DIR . '/dist/' . $lib->getName() . '-' . arch2gnu(php_uname('m')) . '-' . strtolower(PHP_OS_FAMILY) . '.' . Config::getPreBuilt('suffix'); - f_passthru('tar -czf ' . $filename . ' -T ' . WORKING_DIR . '/packlib_files.txt -C ' . WORKING_DIR); + f_passthru('tar -czf ' . $filename . ' -T ' . WORKING_DIR . '/packlib_files.txt'); logger()->info('Pack library ' . $lib->getName() . ' to ' . $filename . ' complete.'); } } diff --git a/src/SPC/store/Downloader.php b/src/SPC/store/Downloader.php index 6e127c98..32085567 100644 --- a/src/SPC/store/Downloader.php +++ b/src/SPC/store/Downloader.php @@ -558,7 +558,6 @@ class Downloader try { f_passthru($cmd); } catch (RuntimeException $e) { - var_dump($e->getCode()); if ($e->getCode() === 2 || $e->getCode() === -1073741510) { throw new WrongUsageException('Keyboard interrupted, download failed !'); }