From 1109569162f87304ef67b29230edc68fb68dba35 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 28 Nov 2024 14:22:25 +0000 Subject: [PATCH] ncm-accounts: Fix wrapping and indentation in pan --- .../pan/components/accounts/functions.pan | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/ncm-accounts/src/main/pan/components/accounts/functions.pan b/ncm-accounts/src/main/pan/components/accounts/functions.pan index c052fb16cd..0a60cb6d7a 100644 --- a/ncm-accounts/src/main/pan/components/accounts/functions.pan +++ b/ncm-accounts/src/main/pan/components/accounts/functions.pan @@ -120,16 +120,12 @@ function create_user = { }; accounts = SELF; - if ( !exists(user_params['homeDir']) && - exists(ACCOUNTS_USER_HOME_ROOT) && - is_defined(username) ) { - user_params['homeDir'] = ACCOUNTS_USER_HOME_ROOT + '/' + username; + if ( !exists(user_params['homeDir']) && exists(ACCOUNTS_USER_HOME_ROOT) && is_defined(username) ) { + user_params['homeDir'] = ACCOUNTS_USER_HOME_ROOT + '/' + username; }; - if ( !exists(user_params['createHome']) && - exists(ACCOUNTS_USER_CREATE_HOME) && - exists(user_params['homeDir']) ) { - user_params['createHome'] = ACCOUNTS_USER_CREATE_HOME; + if ( !exists(user_params['createHome']) && exists(ACCOUNTS_USER_CREATE_HOME) && exists(user_params['homeDir']) ) { + user_params['createHome'] = ACCOUNTS_USER_CREATE_HOME; }; if ( !exists(user_params['password']) && exists(ACCOUNTS_USER_PWD) ) { @@ -150,10 +146,8 @@ function create_user = { ok = first(user_params['groups'], i, groupname); while (ok) { if ( !exists(accounts['groups'][groupname]) ) { - if ( groupname == username && - exists(user_params['uid']) && - !exists(user_params['poolStart']) ) { - accounts = create_group(groupname, dict('gid', user_params['uid'])); + if ( groupname == username && exists(user_params['uid']) && !exists(user_params['poolStart']) ) { + accounts = create_group(groupname, dict('gid', user_params['uid'])); } else { if (ACCOUNTS_IGNORE_MISSING_GROUPS) { delete(user_params['groups'][i]); @@ -227,7 +221,7 @@ function create_accounts_from_db = { } else { accounts = create_group(accountname, accounts_db[accountname]); }; - ok = next(account_list, i, accountname); + ok = next(account_list, i, accountname); }; } else { ok = first(accounts_db, accountname, account_params);