Small refactor of user/groups and add checks during startup. Only use -x in bash scripts when DEBUG=true set in env vars

This commit is contained in:
Jamie Curnow
2023-05-04 10:03:06 +10:00
parent a1245bc161
commit c432c34fb3
14 changed files with 70 additions and 45 deletions

View File

@ -12,6 +12,11 @@ export CYAN BLUE YELLOW RED RESET
PUID=${PUID:-0}
PGID=${PGID:-0}
NPMUSER=npm
NPMGROUP=npm
NPMHOME=/tmp/npmuserhome
export NPMUSER NPMGROUP NPMHOME
if [[ "$PUID" -ne '0' ]] && [ "$PGID" = '0' ]; then
# set group id to same as user id,
# the user probably forgot to specify the group id and
@ -40,3 +45,10 @@ log_fatal () {
/run/s6/basedir/bin/halt
exit 1
}
# param $1: group_name
get_group_id () {
if [ "${1:-}" != '' ]; then
getent group "$1" | cut -d: -f3
fi
}