Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions scripts/node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ echo " NODE=${NODE}"
echo " LOG=${LOG}"
echo " COMMAND=${COMMAND}"

ACTIVATION_HOOK="$(pixi shell-hook)"
ACTIVATION_HOOK=$(printf '%q ' "$(pixi shell-hook)")
SCRIPT_HEADER='
echo Running on $(hostname) in $(pwd)
echo Process ID: $$
'
SCRIPT="
SCRIPT=$(printf '%q ' "
${SCRIPT_HEADER}
echo Run command: ${COMMAND}
${COMMAND}
"
")

# Enter working directory and initiate job from the first SSH node
ssh ${NODE} /bin/env bash << EOF
ssh ${NODE} /bin/env bash -l << EOF
set -e
cd ${WD}
${SCRIPT_HEADER}
eval ${ACTIVATION_HOOK@Q}
nohup sh -c ${SCRIPT@Q} > ${LOG} 2>&1 &
EOF
eval ${ACTIVATION_HOOK}
nohup sh -c ${SCRIPT} > ${LOG} 2>&1 &
EOF
6 changes: 3 additions & 3 deletions scripts/subtasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ done

cd ${INIT_CWD:-$(pwd)}

COMMAND="automech subtasks run ${@:ARG_OFFSET}"
ARGS=$(printf '%q ' "${@:ARG_OFFSET}")
COMMAND="automech subtasks run ${ARGS}"

# echo pixi run node ${@: -1} ${SUBTASK_LOG} ${COMMAND@Q}
pixi run node ${@: -1} ${SUBTASK_LOG} ${COMMAND@Q}
pixi run node ${@: -1} ${SUBTASK_LOG} "${COMMAND}"