Skip to content

Commit dea770f

Browse files
Copilotobnoxxx
authored andcommitted
cli/builbo: fix default action to help when none specified
ACTION was set to ${DEFAULT_ACTION} ("help"), then immediately overwritten with ACTION="" two lines later, causing the script to have no action when the user provides no action flag. Remove the overwrite so that ACTION retains its default value of "help", consistent with DEFAULT_ACTION. This means running builbo with no action flag now correctly displays the usage/help text.
1 parent f5a6c74 commit dea770f

1 file changed

Lines changed: 22 additions & 21 deletions

File tree

cli/builbo

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,36 @@
33
function detect_container_command() {
44

55

6-
if [ -z "${DEFAULT_CONTAINER_CMD}" ]; then
7-
DEFAULT_CONTAINER_CMD="$(podman version > /dev/null 2>&1 && echo podman)"
8-
fi
9-
if [ -z "${DEFAULT_CONTAINER_CMD}" ]; then
10-
DEFAULT_CONTAINER_CMD="$(docker version > /dev/null 2>&1 && echo docker)"
11-
fi
12-
CONTAINER_CMD="${DEFAULT_CONTAINER_CMD}"
6+
if [ -z "${DEFAULT_CONTAINER_CMD}" ]; then
7+
DEFAULT_CONTAINER_CMD="$(podman version > /dev/null 2>&1 && echo podman)"
8+
fi
9+
if [ -z "${DEFAULT_CONTAINER_CMD}" ]; then
10+
DEFAULT_CONTAINER_CMD="$(docker version > /dev/null 2>&1 && echo docker)"
11+
fi
12+
CONTAINER_CMD="${DEFAULT_CONTAINER_CMD}"
1313
}
1414

1515

1616

1717
# default values for ccommand line options:
1818
#
1919
#DEFAULT_CONTAINER_CMD=""
20-
DEFAULT_LANG="c"
21-
LANG="${DEFAULT_LANG}"
22-
DEFAULT_REGISTRY="quay.io"
23-
REGISTRY="${DEFAULT_REGISTRY}"
24-
CONTAINER_CMD=""
25-
DEFAULT_OS=fedora
26-
OS="${DEFAULT_OS}"
27-
DEFAULT_NAMESPACE="buildbox"
28-
NAMESPACE="${DEFAULT_NAMESPACE}"
29-
BUILD_CMD=""
30-
DEPS=""
31-
DEFAULT_ACTION="help"
20+
DEFAULT_LANG="c"
21+
LANG="${DEFAULT_LANG}"
22+
DEFAULT_REGISTRY="quay.io"
23+
REGISTRY="${DEFAULT_REGISTRY}"
24+
CONTAINER_CMD=""
25+
DEFAULT_OS=fedora
26+
OS="${DEFAULT_OS}"
27+
DEFAULT_NAMESPACE="buildbox"
28+
NAMESPACE="${DEFAULT_NAMESPACE}"
29+
BUILD_CMD=""
30+
DEPS=""
31+
DEFAULT_ACTION="help"
32+
ACTION="${DEFAULT_ACTION}"
33+
# action that was explicitly set from the command line:
34+
SELECTED_ACTION=""
3235
ACTION="${DEFAULT_ACTION}"
33-
# action that was explicitly set from the command line:
34-
SELECTED_ACTION=""
3536
# shell for interactive use:
3637
DEFAULT_I_SHELL="bash"
3738
I_SHELL="${DEFAULT_I_SHELL}"

0 commit comments

Comments
 (0)