Commit 286cb2bb authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix positional arguments when specified in config

parent 345d9d07
Loading
Loading
Loading
Loading
+11 −10
Original line number Diff line number Diff line
@@ -77,17 +77,18 @@ while [[ $# -gt 0 ]]; do
	offset=0
done

trap '{ echo; usage; } >&2' EXIT
set -- "${ARGS[@]}"
: ${TOKEN:=${1? A registration token is required}} \
  ${NAME:=${2-${DEFAULT_NAME}}} \
  ${COORDINATOR_URL? Need COORDINATOR_URL in configs or environment, or --url} \
shift 2
if [[ $# -eq 0 ]]; then
	echo >&2 "Unknown arguments: $*"
declare -n arg_var
for arg_var in TOKEN NAME; do
	[[ $# -gt 0 ]] || break
	arg_var=$1
	shift
done
if [[ $# -gt 0 ]]; then
	printf >&2 "Unknown arguments: $*\n\n"
	usage >&2
	exit 2
fi
trap - EXIT

mkdir -p --mode=0750 ${CONFIG_BASE}

@@ -126,8 +127,8 @@ find_name
docker run --rm -t -i -v ${RUNNER_CONFIG}:/etc/gitlab-runner \
	${IMAGE} register \
	--non-interactive \
	--url ${COORDINATOR_URL} \
	--registration-token ${TOKEN} \
	--url ${COORDINATOR_URL? Need COORDINATOR_URL in configs or environment, or --url} \
	--registration-token ${TOKEN? A registration token is required} \
	--description ${DESCRIPTION-$DEFAULT_DESCRIPTION} \
	--executor docker \
	--docker-image docker:stable \