Skip to content
Snippets Groups Projects
Commit 4956fdc8 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'release/v2.1.3'

parents 70cae7b0 83cd32dd
No related branches found
No related tags found
No related merge requests found
......@@ -10,4 +10,4 @@ if [[ -n "$1" ]]; then
fi
fi
/usr/local/bin/${COMMAND} $@
/usr/local/bin/${COMMAND} "$@"
......@@ -101,4 +101,4 @@ project_params=(
docker exec -it \
"${project_params[@]}" \
l3drun \
/usr/local/bin/run $@
/usr/local/bin/run "$@"
......@@ -241,18 +241,19 @@ if [[ -d /drupal/.idea ]]; then
fi
restoreEnvFile
if [[ -x "${L3DSHELL}" ]]; then
${L3DSHELL}
else
/usr/bin/fish
fi
# Configure Git Hook
if [[ ! -f .git/hooks/post-checkout ]]; then
echo "#!/bin/sh" > .git/hooks/post-checkout
chmod +x .git/hooks/post-checkout
fi
HOOK_DEFINED=$(grep /usr/local/bin/update-env .git/hooks/post-checkout)
if [[ "$HOOK_DEFINED" = "" ]]; then
echo "/usr/local/bin/update-env" >> .git/hooks/post-checkout
echo "docker exec ${COMPOSE_PROJECT_NAME}_l3d /usr/local/bin/update-env" >> .git/hooks/post-checkout
fi
/usr/local/bin/update-env
if [[ -x "${L3DSHELL}" ]]; then
${L3DSHELL}
else
/usr/bin/fish
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment