From 9405974cc9dadcfa0636eec5d6c6a33a453321d0 Mon Sep 17 00:00:00 2001
From: Adrian Dvergsdal <github.com@konto.atmoz.no>
Date: Thu, 4 Jan 2018 19:22:15 +0100
Subject: [PATCH] Tidy up variables in createUser()

---
 entrypoint | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/entrypoint b/entrypoint
index 7e904e0..471dcc2 100755
--- a/entrypoint
+++ b/entrypoint
@@ -37,29 +37,28 @@ function createUser() {
     log "Parsing user data: \"$@\""
 
     IFS=':' read -a args <<< $@
-    index=0
+
+    skipIndex=0
+    chpasswdOptions=""
+    useraddOptions="--no-user-group"
 
     user="${args[0]}"; validateArg "username" "$user" "$reUser" || return 1
     pass="${args[1]}"; validateArg "password" "$pass" "$rePass" || return 1
 
     if [ "${args[2]}" == "e" ]; then
         chpasswdOptions="-e"
-        index=1
-    else
-        chpasswdOptions=""
+        skipIndex=1
     fi
 
-    uid="${args[$[$index+2]]}"; validateArg "UID" "$uid" "$reUid" || return 1
-    gid="${args[$[$index+3]]}"; validateArg "GID" "$gid" "$reGid" || return 1
-    dir="${args[$[$index+4]]}"; validateArg "dirs" "$dir" "$reDir" || return 1
+    uid="${args[$[$skipIndex+2]]}"; validateArg "UID" "$uid" "$reUid" || return 1
+    gid="${args[$[$skipIndex+3]]}"; validateArg "GID" "$gid" "$reGid" || return 1
+    dir="${args[$[$skipIndex+4]]}"; validateArg "dirs" "$dir" "$reDir" || return 1
 
     if getent passwd $user > /dev/null; then
         log "WARNING: User \"$user\" already exists. Skipping."
         return 0
     fi
 
-    useraddOptions="--no-user-group"
-
     if [ -n "$uid" ]; then
         useraddOptions="$useraddOptions --non-unique --uid $uid"
     fi