From 0874f2986671342af6f8c8cb6cf9358fa6541f23 Mon Sep 17 00:00:00 2001 From: dimasites Date: Fri, 28 Apr 2023 18:30:52 +0300 Subject: [PATCH] Added build env gui via git submodule and download package link --- .gitmodules | 3 ++ _build/env | 1 + _build/index.php | 57 ---------------------------- _build/minishop2/build.transport.php | 4 +- 4 files changed, 6 insertions(+), 59 deletions(-) create mode 100644 .gitmodules create mode 160000 _build/env delete mode 100644 _build/index.php diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..88876930c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "_build/env"] + path = _build/env + url = https://github.com/dimasites/modx-build-environment-gui diff --git a/_build/env b/_build/env new file mode 160000 index 000000000..f59f17a88 --- /dev/null +++ b/_build/env @@ -0,0 +1 @@ +Subproject commit f59f17a8812cf5da2fef6283294eecc29f28a46e diff --git a/_build/index.php b/_build/index.php deleted file mode 100644 index fb8d0a7be..000000000 --- a/_build/index.php +++ /dev/null @@ -1,57 +0,0 @@ -MODX build environment GUI"; - echo "Available packages for build: (with versions from build.config.php if exists)

"; - //echo "Данные о версии берутся из файла конфигурации пакета (build.config.php)

"; - foreach ($scanned_directory as $packagename) { - if (is_dir($current_dir.'/'.$packagename)) { - $config = file_get_contents($current_dir.'/'.$packagename.'/'."build.config.php"); - /*parse version*/ - $version_preg = "#PKG_VERSION['\",=\s]*([0-9\.]+)#"; - $release_preg = "#PKG_RELEASE['\",=\s]*([a-z0-9\.]+)['\"]#"; - $version = ''; - $matches = []; - if (preg_match($version_preg, $config, $matches)) { - $version .= $matches[1]; - } - if (preg_match($release_preg, $config, $matches)) { - $version .= '-'.$matches[1]; - } - echo "{$packagename} [build package] (".$version.")

"; - } - } - - echo "
Made for MODX RSC by @dimasites and friends
"; - -}else{ -// Define paths - if (isset($_SERVER['MODX_BASE_PATH'])) { - define('MODX_BASE_PATH', $_SERVER['MODX_BASE_PATH']); - } elseif (file_exists(dirname(__FILE__, 2) . '/core')) { - define('MODX_BASE_PATH', dirname(__FILE__, 2) . '/'); - } else { - define('MODX_BASE_PATH', dirname(__FILE__, 3) . '/'); - } - - $file = MODX_CORE_PATH.'packages/'.$_REQUEST['getpackage'].'.transport.zip'; - - if (file_exists($file)) { - header('Content-Description: File Transfer'); - header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename="' . basename($file) . '"'); - header('Expires: 0'); - header('Cache-Control: must-revalidate'); - header('Pragma: public'); - header('Content-Length: ' . filesize($file)); - readfile($file); - exit; - } -} diff --git a/_build/minishop2/build.transport.php b/_build/minishop2/build.transport.php index 6d5bb08c9..f80ee3bf1 100644 --- a/_build/minishop2/build.transport.php +++ b/_build/minishop2/build.transport.php @@ -305,8 +305,8 @@ } $modx->log(modX::LOG_LEVEL_INFO, "\n
Execution time: {$totalTime}\n"); -$download_url = '/_build/index.php?getpackage='.PKG_NAME_LOWER.'-'.PKG_VERSION.'-'.PKG_RELEASE; -$modx->log(modX::LOG_LEVEL_INFO,"\n
Download package
\n"); +$download_url = '/_build/env/index.php?getpackage='.PKG_NAME_LOWER.'-'.PKG_VERSION.'-'.PKG_RELEASE; +$modx->log(modX::LOG_LEVEL_INFO,"\n
[DOWNLOAD PACKAGE]
\n"); echo '';