@@ -27,7 +27,7 @@ declare -rg MR_GIHUB_BASEURL="${MR_GIHUB_BASEURL:-https://github.com}"
27
27
# runners' local username prefix, defaults to `runner-`
28
28
declare -rg MR_USER_PREFIX=" ${MR_USER_PREFIX:- runner-} "
29
29
# runners' local users base directory, overrides the `HOME` setting in `/etc/default/useradd`
30
- declare -rg MR_USER_BASE= " ${MR_USER_BASE :- $(useradd -D | grep ' ^HOME= ' | cut -d= -f2-)} "
30
+ declare -rg MR_USER_BASE
31
31
# URL of this application
32
32
declare -rg MR_URL=' https://github.com/vbem/multi-runners'
33
33
@@ -152,10 +152,12 @@ function mr::addUser {
152
152
id -u " $user " & > /dev/null || break
153
153
done
154
154
fi
155
+ useraddArgs=(-m -s /bin/bash -G ' runners,docker' )
156
+ [[ -n " $MR_USER_BASE " ]] && useraddArgs+=(' -b' " $MR_USER_BASE " )
155
157
run::logFailed sudo tee /etc/sudoers.d/runners <<< ' %runners ALL=(ALL) NOPASSWD:ALL' > /dev/null \
156
158
&& run::logFailed sudo groupadd -f ' runners' >&2 \
157
159
&& run::logFailed sudo groupadd -f ' docker' >&2 \
158
- && run::log sudo useradd -b " $MR_USER_BASE " -m -s /bin/bash -G ' runners,docker ' " $user " >&2 || return $?
160
+ && run::log sudo useradd " ${useraddArgs[@]} " " $user " >&2 || return $?
159
161
echo " $user "
160
162
}
161
163
@@ -320,7 +322,7 @@ Environment variables:
320
322
MR_GIHUB_BASEURL=$MR_GIHUB_BASEURL
321
323
MR_GIHUB_API_BASEURL=$MR_GIHUB_API_BASEURL
322
324
MR_RELEASE_URL=${MR_RELEASE_URL:- <latest on github.com/ actions/ runner/ releases>}
323
- MR_USER_BASE=$MR_USER_BASE
325
+ MR_USER_BASE=${ MR_USER_BASE:- <default in / etc / default / useradd>}
324
326
MR_GITHUB_PAT=${MR_GITHUB_PAT:: 11}${MR_GITHUB_PAT: +*** }
325
327
326
328
Sub-commands:
0 commit comments