leviathonbeast/lldap
1
0
Fork 0
mirror of https://github.com/lldap/lldap.git synced 2026-03-31 15:07:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap: do not fail if no user or group defined

Browse Source
This commit is contained in:
ibizaman
2025-07-17 18:29:24 +02:00
committed by nitnelave
parent 0b0e6ae2cd
commit f02b365478
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/bootstrap.sh
+10 -4
View File
@@ -596,12 +596,18 @@ main() {
check_install_dependencies check_install_dependencies
check_required_env_vars check_required_env_vars
local user_config_files=("${USER_CONFIGS_DIR}"/*.json) local user_config_files=()
local group_config_files=("${GROUP_CONFIGS_DIR}"/*.json) local group_config_files=()
local user_schema_files=() local user_schema_files=()
local group_schema_files=() local group_schema_files=()
local file='' local file=''
[[ -d "$USER_CONFIGS_DIR" ]] && for file in "${USER_CONFIGS_DIR}"/*.json; do
user_config_files+=("$file")
done
[[ -d "$GROUP_CONFIGS_DIR" ]] && for file in "${GROUP_CONFIGS_DIR}"/*.json; do
group_config_files+=("$file")
done
[[ -d "$USER_SCHEMAS_DIR" ]] && for file in "${USER_SCHEMAS_DIR}"/*.json; do [[ -d "$USER_SCHEMAS_DIR" ]] && for file in "${USER_SCHEMAS_DIR}"/*.json; do
user_schema_files+=("$file") user_schema_files+=("$file")
done done
@@ -647,7 +653,7 @@ main() {
printf -- '\n--- groups ---\n' printf -- '\n--- groups ---\n'
local group_config='' local group_config=''
while read -r group_config; do [[ ${#group_config_files[@]} -gt 0 ]] && while read -r group_config; do
local group_name='' local group_name=''
group_name="$(printf '%s' "$group_config" | jq --raw-output '.name')" group_name="$(printf '%s' "$group_config" | jq --raw-output '.name')"
create_group "$group_name" create_group "$group_name"
@@ -690,7 +696,7 @@ main() {
TMP_AVATAR_DIR="$(mktemp -d)" TMP_AVATAR_DIR="$(mktemp -d)"
local user_config='' local user_config=''
while read -r user_config; do [[ ${#user_config_files[@]} -gt 0 ]] && while read -r user_config; do
local field='' id='' email='' displayName='' firstName='' lastName='' avatar_file='' avatar_url='' gravatar_avatar='' weserv_avatar='' password='' password_file='' local field='' id='' email='' displayName='' firstName='' lastName='' avatar_file='' avatar_url='' gravatar_avatar='' weserv_avatar='' password='' password_file=''
for field in 'id' 'email' 'displayName' 'firstName' 'lastName' 'avatar_file' 'avatar_url' 'gravatar_avatar' 'weserv_avatar' 'password' 'password_file'; do for field in 'id' 'email' 'displayName' 'firstName' 'lastName' 'avatar_file' 'avatar_url' 'gravatar_avatar' 'weserv_avatar' 'password' 'password_file'; do
declare "$field"="$(printf '%s' "$user_config" | jq --raw-output --arg field "$field" '.[$field]')" declare "$field"="$(printf '%s' "$user_config" | jq --raw-output --arg field "$field" '.[$field]')"