From 7b924483e7c1a713702467b2002882a0552f09b0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 23 May 2026 12:54:12 +0000 Subject: [PATCH] fix: cd to script's directory for absolute paths in run_normal --- back/loaders/initFile.ts | 12 +----------- shell/otask.sh | 2 ++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/back/loaders/initFile.ts b/back/loaders/initFile.ts index e1c56060..2eab9446 100644 --- a/back/loaders/initFile.ts +++ b/back/loaders/initFile.ts @@ -18,13 +18,8 @@ const scriptPath = path.join(dataPath, 'scripts/'); const logPath = path.join(dataPath, 'log/'); const uploadPath = path.join(dataPath, 'upload/'); const bakPath = path.join(dataPath, 'bak/'); -const dbPath = path.join(dataPath, 'db/'); -const repoPath = path.join(dataPath, 'repo/'); -const rawPath = path.join(dataPath, 'raw/'); -const dependenceCachePath = path.join(dataPath, 'dep_cache/'); const samplePath = path.join(rootPath, 'sample/'); const tmpPath = path.join(logPath, '.tmp/'); -const updateLogPath = path.join(logPath, 'update/'); const confFile = path.join(configPath, 'config.sh'); const sampleConfigFile = path.join(samplePath, 'config.sample.sh'); const sampleTaskShellFile = path.join(samplePath, 'task.sample.sh'); @@ -49,16 +44,11 @@ const directories = [ preloadPath, logPath, tmpPath, - updateLogPath, uploadPath, sshPath, bakPath, sshdPath, systemLogPath, - dbPath, - repoPath, - rawPath, - dependenceCachePath, ]; const files = [ @@ -114,7 +104,7 @@ const files = [ export default async () => { for (const dirPath of directories) { if (!(await fileExist(dirPath))) { - await fs.mkdir(dirPath, { recursive: true }); + await fs.mkdir(dirPath); } } diff --git a/shell/otask.sh b/shell/otask.sh index 516a9439..28315838 100755 --- a/shell/otask.sh +++ b/shell/otask.sh @@ -95,6 +95,8 @@ run_normal() { if [[ ${file_param} != /* ]] && [[ ! -z ${relative_path} ]] && [[ ${file_param} =~ "/" ]]; then cd ${relative_path} file_param=${file_param/$relative_path\//} + elif [[ ${file_param} == /* ]] && [[ ! -z ${relative_path} ]]; then + cd ${relative_path} fi if [[ $isJsOrPythonFile == 'false' ]]; then