Skip to content
Merged
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
4 changes: 2 additions & 2 deletions internal/common/tasks/scripts/flash_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ if [ -n "${OCI_USERNAME}" ] && [ -n "${OCI_PASSWORD}" ]; then
jmp shell ${JMP_SHELL_ARGS} -- env \
OCI_USERNAME="${OCI_USERNAME}" \
OCI_PASSWORD="${OCI_PASSWORD}" \
${FLASH_CMD}
sh -c "${FLASH_CMD}"
FLASH_EXIT=$?
set -e # Restore errexit
else
# No credentials, run flash command directly
# shellcheck disable=SC2086
set +e # Temporarily disable errexit to capture exit code
jmp shell ${JMP_SHELL_ARGS} -- ${FLASH_CMD}
jmp shell ${JMP_SHELL_ARGS} -- sh -c "${FLASH_CMD}"
FLASH_EXIT=$?
set -e # Restore errexit
fi
Expand Down
Loading