#62 update start script

run/scripts/start

@@ -36,52 +36,31 @@ function startContainer {
     if [[ -n ${ID} ]]; then
       docker start ${COMPOSE_PROJECT_NAME}_l3d
     else
-      case "${L3DHOSTOS}" in
-        Darwin*)
-          docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
-            --hostname ${COMPOSE_PROJECT_NAME}-l3d \
-            --group-add ${GROUPIDS// / --group-add } \
-            --env L3DSHELL=${L3DSHELL} \
-            --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
-            --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
-            --env PHP_VERSION=${PHP_VERSION} \
-            --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
-            --volume /var/run/docker.sock:/var/run/docker.sock \
-            --volume ${WORKDIR}:/drupal \
-            --volume /etc/group:/etc/group:ro \
-            --volume /etc/passwd:/etc/passwd:ro \
-            --volume /etc/shadow:/etc/shadow:ro \
-            --volume /etc/sudoers:/etc/sudoers:ro \
-            --volume /etc/sudoers.d:/etc/sudoers.d:ro \
-            --volume ${SSHAUTH}:${SSHAUTHSOCK} \
-            --volume ${HOMEDIR}:${HOMEDIR} \
-            --workdir /drupal \
-            --restart unless-stopped \
-            registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
-          ;;
-        *)
-          docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
-            --hostname ${COMPOSE_PROJECT_NAME}-l3d \
-            --user ${USERID}:${GROUPID} \
-            --group-add ${GROUPIDS// / --group-add } \
-            --env L3DSHELL=${L3DSHELL} \
-            --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
-            --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
-            --env PHP_VERSION=${PHP_VERSION} \
-            --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
-            --volume /var/run/docker.sock:/var/run/docker.sock \
-            --volume ${WORKDIR}:/drupal \
-            --volume /etc/group:/etc/group:ro \
-            --volume /etc/passwd:/etc/passwd:ro \
-            --volume /etc/shadow:/etc/shadow:ro \
-            --volume /etc/sudoers:/etc/sudoers:ro \
-            --volume /etc/sudoers.d:/etc/sudoers.d:ro \
-            --volume ${SSHAUTH}:${SSHAUTHSOCK} \
-            --volume ${HOMEDIR}:${HOMEDIR} \
-            --workdir /drupal \
-            --restart unless-stopped \
-            registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
-      esac
+      start_params=(--hostname ${COMPOSE_PROJECT_NAME}-l3d \
+                    --group-add ${GROUPIDS// / --group-add } \
+                    --env L3DSHELL=${L3DSHELL} \
+                    --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+                    --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
+                    --env PHP_VERSION=${PHP_VERSION} \
+                    --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
+                    --volume /var/run/docker.sock:/var/run/docker.sock \
+                    --volume ${WORKDIR}:/drupal \
+                    --volume /etc/group:/etc/group:ro \
+                    --volume /etc/passwd:/etc/passwd:ro \
+                    --volume /etc/shadow:/etc/shadow:ro \
+                    --volume /etc/sudoers:/etc/sudoers:ro \
+                    --volume /etc/sudoers.d:/etc/sudoers.d:ro \
+                    --volume ${SSHAUTH}:${SSHAUTHSOCK} \
+                    --volume ${HOMEDIR}:${HOMEDIR} \
+                    --workdir /drupal \
+                    --restart unless-stopped \
+                  ) 
+      if [[ ${L3DHOSTOS} != Darwin ]]; then
+        start_params+=(--user ${USERID}:${GROUPID})
+      fi
+      docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
+        "${start_params[@]}" \
+        registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
     fi
     docker exec -it \
       --env HOMEDIR=${HOMEDIR} \