Fix useradd function

Author: Carlos Brandt

entrypoint.sh

@@ -26,26 +26,25 @@ function config_user()
     # Variables DUSER, DUID, DGID are read from the  #
     #  environment; if NOUSER is set, do nothing.    #
     #================================================#
-    
+
     DEFAULT_USER="user"
     DEFAULT_UID="1000"
     DEFAULT_GID="100"
-    
+
     [[ ! -z "$NOUSER" ]] && \
         # nothing to be done here
         return 0
-    
+
     DUSER="${DUSER:-$DEFAULT_USER}"
     DUID="${DUID:-$DEFAULT_UID}"
     DGID="${DGID:-$DEFAULT_GID}"
-    
-    [[ `id $DUSER > /dev/null` ]] && \
-        useradd -u "$DUID" \
-                -g "$DGID" \
-                -d "/home/$DUSER" -m \
-                -s /bin/bash \
-                "$DUSER"
-    
+
+    `id $DUSER &> /dev/null` || useradd -u "$DUID" \
+                                        -g "$DGID" \
+                                        -d "/home/$DUSER" -m \
+                                        -s /bin/bash \
+                                        "$DUSER"
+
     echo "$DUSER"
     return 0
 }
@@ -55,7 +54,7 @@ function config_user()
 USERNAME=$(config_user)
 
 # If no user created, define the current one (root)
-[[ `id "$USERNAME"` ]] || USERNAME="$USER"
+[ `id "$USERNAME"` ] || USERNAME="$USER"
 
 # Garantee the user will run on a proper place.
 # WORKDIR is the dir where the user will run from.
@@ -72,17 +71,16 @@ chown ${USERNAME}: $WORKDIR && chmod -R u+wrx $WORKDIR
 USERID=$(id -u $USERNAME)
 GROUPID=$(id -g $USERNAME)
 
-echo "" 
+echo ""
 echo "#====================================================#"
 echo " This container is running: '$EXECAPP',"
 echo " with arguments: '$DARGS',"
 echo " at directory: '$WORKDIR',"
 echo " by user: '${USERNAME} (uid:$USERID,gid:$GROUPID)'."
 echo "#====================================================#"
-echo "" 
+echo ""
 if [ "$EXECAPP" != "$_SHELL" ]; then
     su -l $USERNAME -c "cd $WORKDIR && $EXECAPP $DARGS"
 else
     cd $WORKDIR && su $USERNAME
 fi
-