#31 Make shell configurable

run/scripts/start

@@ -28,6 +28,7 @@ function startContainer {
       touch ${HOMEDIR}/.gitconfig
       docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
         --hostname ${COMPOSE_PROJECT_NAME}-l3d \
+        --env USERSHELL=${USERSHELL} \
         --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
         --env PHP_VERSION=${PHP_VERSION} \
         --env SSH_AUTH_SOCK=${SSHAUTHSOCK} \

setup/scripts/l3d

 #!/bin/bash
 
+if [[ -n ${L3DSHELL} ]]; then
+  USERSHELL=${L3DSHELL}
+elif [[ -n ${SHELL} ]]; then
+  USERSHELL=${SHELL}
+else
+  USERSHELL="/usr/bin/fish"
+fi
 SSHAUTH=${SSH_AUTH_SOCK}
 SSHAUTHSOCK=/ssh-agent
 L3DHOSTOS="$(uname -s)"
@@ -35,6 +42,7 @@ if [[ -f ".env" ]]; then
 fi
 docker exec -it \
   --env HOMEDIR=${HOME} \
+  --env USERSHELL=${USERSHELL} \
   --env WORKDIR=${PWD} \
   --env SSHAUTH=${SSHAUTH} \
   --env SSHAUTHSOCK=${SSHAUTHSOCK} \

start.sh

@@ -75,4 +75,8 @@ if [[ ! -n "$EXISTING" ]]; then
 fi
 
 restoreEnvFile
-/usr/bin/fish
+if [[ -x "${USERSHELL}" ]]; then
+  ${USERSHELL}
+else
+  /usr/bin/fish
+fi