diff options
| author | Tor Egge <Tor.Egge@oath.com> | 2018-03-13 15:04:54 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@oath.com> | 2018-03-13 15:11:13 +0000 |
| commit | 319ed3f9435d1dc4d530f0e3ae4ff4df66185411 (patch) | |
| tree | 26486ef0ebbe63f1cae7d4e1891e6569eb285fd4 /configserver/src/main/sh/start-configserver | |
| parent | 410933939a74e42874dd580bfe0051b3222185a5 (diff) | |
Change new tests to use square bracket style.
Collapse nested if statements.
Diffstat (limited to 'configserver/src/main/sh/start-configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index f9ba6a4f56f..eed616cfe35 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -62,10 +62,8 @@ cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } fixfile () { if [ -f $1 ]; then - if [ "${VESPA_USER}" ]; then - if test "${VESPA_UNPRIVILEGED}" != yes; then - chown ${VESPA_USER} $1 - fi + if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then + chown ${VESPA_USER} $1 fi chmod 644 $1 fi @@ -76,10 +74,8 @@ fixddir () { echo "Creating data directory $1" mkdir -p $1 || exit 1 fi - if [ "${VESPA_USER}" ]; then - if test "${VESPA_UNPRIVILEGED}" != yes; then - chown ${VESPA_USER} $1 - fi + if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then + chown ${VESPA_USER} $1 fi chmod 755 $1 } |