Revert "Override ARGS and fail correctly"
continuous-integration/drone/push Build is passing Details

This reverts commit b2e0a95a11.
This commit is contained in:
3wc 2021-07-10 02:36:01 +02:00
parent e982a45b5e
commit 349b468140
1 changed files with 5 additions and 10 deletions

15
abra
View File

@ -1846,12 +1846,10 @@ sub_app_run(){
RUN_USER="-u $abra___user"
fi
local -a ARGS="${ARGS:-""}"
if [ "$abra___no_tty" = "true" ]; then
ARGS+=" -i"
ARGS="-i"
else
ARGS+=" -it"
ARGS="-it"
fi
CONTAINER=$(docker container ls --format "table {{.ID}},{{.Names}}" \
@ -1863,14 +1861,11 @@ sub_app_run(){
fi
debug "Using container ID ${CONTAINER}"
# shellcheck disable=SC2145
debug "Running command: docker exec $RUN_USER $ARGS $CONTAINER $@"
exit
# 3wc: we want the "splitting" that shellcheck warns us about, so that -u and
# $RUN_USER aren't treated as a single argument:
# shellcheck disable=SC2086
if ! docker exec $RUN_USER $ARGS "$CONTAINER" "$@"; then
exit 1
fi
docker exec $RUN_USER $ARGS "$CONTAINER" "$@"
return
}