diff --git a/.gitignore b/.gitignore index 4d84429..2259317 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ node_modules *.env /apps/api/repos +/repos dist .yarn/* diff --git a/apps/api/index.ts b/apps/api/index.ts index d2a9acc..b049a0c 100644 --- a/apps/api/index.ts +++ b/apps/api/index.ts @@ -69,7 +69,7 @@ for (const job of jobs) { "bash", [`${cwd}/scripts/${job.stepsMainDir}/${steps.script}`], { - cwd: steps.cwd, + cwd: steps.cwd.startsWith('repos/') ? `${cwd}/../../${steps.cwd}` : steps.cwd, shell: true, env: { NT_ARGS: JSON.stringify(job.cmdArgs) }, }, diff --git a/apps/api/util/setup.sh b/apps/api/util/setup.sh index b4bb972..a27a2c8 100644 --- a/apps/api/util/setup.sh +++ b/apps/api/util/setup.sh @@ -1,7 +1,6 @@ #!/bin/bash echo "SERN AUTOMATA SETUP SCRIPT" -cd apps/api rm -rf repos/ @@ -10,17 +9,14 @@ mkdir repos cd repos echo " done" -if [$IS_SRIZAN == "true"] -then - echo -ne "Detected Sr Izan on development environment. chowning repos folder" - sudo chown -R srizan:srizan . +if [ -x "$(command -v sern)" ]; then + echo "sern CLI already installed" +else + echo -ne "Installing sern CLI" + npm install -g @sern/cli echo " done" fi -echo -ne "Installing sern CLI" -npm install -g @sern/cli -echo " done" - echo "Cloning repos" # handler (clone it as sernHandlerV2) echo -ne "- handler"