Skip to content

Commit 733f4a5

Browse files
committed
rebase
1 parent 491451c commit 733f4a5

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

image/actions.sh

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,19 @@ function init-backend-default-workspace() {
310310
function select-workspace() {
311311
local WORKSPACE_EXIT
312312

313-
debug_log $TOOL_COMMAND_NAME workspace select "$VARIABLE_ARGS" "$INPUT_WORKSPACE" # don't expand VARIABLE_ARGS
314-
set +e
315-
(cd "$INPUT_PATH" && $TOOL_COMMAND_NAME workspace select "$VARIABLE_ARGS" "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1
316-
WORKSPACE_EXIT=$?
317-
set -e
313+
if [[ "$VARIABLE_ARGS" == "" ]]; then
314+
debug_log "$TOOL_COMMAND_NAME" workspace select "$INPUT_WORKSPACE"
315+
set +e
316+
(cd "$INPUT_PATH" && "$TOOL_COMMAND_NAME" workspace select "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1
317+
WORKSPACE_EXIT=$?
318+
set -e
319+
else
320+
debug_log "$TOOL_COMMAND_NAME" workspace select '$VARIABLE_ARGS' "$INPUT_WORKSPACE" # don't expand VARIABLE_ARGS
321+
set +e
322+
(cd "$INPUT_PATH" && "$TOOL_COMMAND_NAME" workspace select "$VARIABLE_ARGS" "$INPUT_WORKSPACE") >"$STEP_TMP_DIR/workspace_select" 2>&1
323+
WORKSPACE_EXIT=$?
324+
set -e
325+
fi
318326

319327
if [[ -s "$STEP_TMP_DIR/workspace_select" ]]; then
320328
start_group "Selecting workspace"

0 commit comments

Comments
 (0)