wandoubaba/knowledge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复install.sh中的一个拼写错误

Browse Source
This commit is contained in:
wandoubaba 2023-07-06 13:45:36 +08:00
parent e128cca712
commit bcdb6efd8c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deploy/start.php
View File

@ -19,15 +19,18 @@ $log->pushHandler(new StreamHandler(__DIR__ . '/workerman.log', Logger::INFO));
$worker = new Worker('http://0.0.0.0:8787'); $worker = new Worker('http://0.0.0.0:8787');
$worker->onMessage = function (TcpConnection $connection, Request $request) use ($log) { $worker->onMessage = function (TcpConnection $connection, Request $request) use ($log) {
$log->info('Received POST data', $request->post()); $log->info('Received POST data: ', $request->post());
$work_dir = isset($_ENV['WORK_DIR']) ? $_ENV['WORK_DIR'] : null; $work_dir = isset($_ENV['WORK_DIR']) ? $_ENV['WORK_DIR'] : null;
$branch = isset($_ENV['BRANCH']) ? $_ENV['BRANCH'] : null; $branch = isset($_ENV['BRANCH']) ? $_ENV['BRANCH'] : null;
$git_url = isset($_ENV['GIT_URL']) ? $_ENV['GIT_URL'] : null; $git_url = isset($_ENV['GIT_URL']) ? $_ENV['GIT_URL'] : null;
$log->info('env: ' . json_encode(['work_dir' => $work_dir, 'branch' => $branch, 'git_url' => $git_url], JSON_UNESCAPED_UNICODE));
if ($work_dir && $branch && $git_url) { if ($work_dir && $branch && $git_url) {
$repository = $request->post('repository'); $repository = $request->post('repository');
$log->info('repository: ', $repository);
if (is_array($repository)) { if (is_array($repository)) {
$ssh_url = isset($repository['ssh_url']) ? $repository['ssh_url'] : null; $ssh_url = isset($repository['ssh_url']) ? $repository['ssh_url'] : null;
$clone_url = isset($repository['clone_url']) ? $repository['clone_url'] : null; $clone_url = isset($repository['clone_url']) ? $repository['clone_url'] : null;
$log->info('ssh_url & clone_url: ' . json_encode(['ssh_url' => $ssh_url, 'clone_url' => $clone_url], JSON_UNESCAPED_UNICODE));
if ($git_url === $ssh_url || $git_url === $clone_url) { if ($git_url === $ssh_url || $git_url === $clone_url) {
chdir($work_dir); chdir($work_dir);
shell_exec("sh auto_build.sh > /dev/null &"); shell_exec("sh auto_build.sh > /dev/null &");

2
install.sh
View File

@ -37,7 +37,7 @@ else
# 创建.env文件 # 创建.env文件
branch=$(git branch --show-current) branch=$(git branch --show-current)
git_url=$(git remote -v | grep fetch | awk '{print $2}') git_url=$(git remote -v | grep fetch | awk '{print $2}')
echo "WORD_DIR = \"$work_dir\"" >"$env_file" echo "WORK_DIR = \"$work_dir\"" >"$env_file"
echo "BRANCH = \"$branch\"" >>"$env_file" echo "BRANCH = \"$branch\"" >>"$env_file"
echo "GIT_URL = \"$git_url\"" >>"$env_file" echo "GIT_URL = \"$git_url\"" >>"$env_file"
echo "[$(date +"%Y-%m-%d %H:%M:%S")] .env文件创建成功" >>"$log_file" echo "[$(date +"%Y-%m-%d %H:%M:%S")] .env文件创建成功" >>"$log_file"